demo

aqua-examples/aqua-ipfs-integration/aqua/package.json

@@ -5,8 +5,8 @@
   "main": "dist/index.js",
   "scripts": {
     "postinstall": "../service/scripts/build.sh && npm run build",
-    "compile-aqua": "aqua-cli -i . -o .",
-    "build": "npm run compile-aqua && tsc"
+    "compile-aqua": "aqua-cli -i src -o ../aqua-ts",
+    "build": "npm run compile-aqua"
   },
   "keywords": [
     "fluence",
@@ -22,16 +22,9 @@
   "license": "MIT",
   "dependencies": {
     "@fluencelabs/aqua-ipfs": "^0.1.8",
-    "@fluencelabs/fluence": "0.9.53",
-    "@fluencelabs/fluence-network-environment": "1.0.10",
-    "@fluencelabs/aqua-lib": "0.1.10",
-    "ipfs-http-client": "^50.1.2",
-    "it-all": "^1.0.5",
-    "uint8arrays": "^2.1.5",
-    "multiaddr": "^10.0.0"
+    "@fluencelabs/aqua-lib": "0.1.10"
   },
   "devDependencies": {
-    "typescript": "^3.9.5",
     "@fluencelabs/aqua-cli": "0.1.9-164"
   }
 }

aqua-examples/aqua-ipfs-integration/aqua/src/index.ts

@@ -1 +0,0 @@
-export * from './process'

aqua-examples/aqua-ipfs-integration/aqua/tsconfig.json

@@ -1,62 +0,0 @@
-{
-    "compilerOptions": {
-        /* Visit https://aka.ms/tsconfig.json to read more about this file */
-        /* Basic Options */
-        // "incremental": true,                   /* Enable incremental compilation */
-        "target": "es5", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
-        "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
-        // "lib": [],                             /* Specify library files to be included in the compilation. */
-        // "allowJs": true,                       /* Allow javascript files to be compiled. */
-        // "checkJs": true,                       /* Report errors in .js files. */
-        // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
-        "declaration": true, /* Generates corresponding '.d.ts' file. */
-        // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
-        // "sourceMap": true,                     /* Generates corresponding '.map' file. */
-        // "outFile": "./",                       /* Concatenate and emit output to single file. */
-        "outDir": "./dist", /* Redirect output structure to the directory. */
-        //"rootDir": ".",                         /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
-        // "composite": true,                     /* Enable project compilation */
-        // "tsBuildInfoFile": "./",               /* Specify file to store incremental compilation information */
-        // "removeComments": true,                /* Do not emit comments to output. */
-        // "noEmit": true,                        /* Do not emit outputs. */
-        // "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
-        // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
-        // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
-        /* Strict Type-Checking Options */
-        "strict": true, /* Enable all strict type-checking options. */
-        // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
-        // "strictNullChecks": true,              /* Enable strict null checks. */
-        // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
-        // "strictBindCallApply": true,           /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
-        // "strictPropertyInitialization": true,  /* Enable strict checking of property initialization in classes. */
-        // "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
-        // "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
-        /* Additional Checks */
-        // "noUnusedLocals": true,                /* Report errors on unused locals. */
-        // "noUnusedParameters": true,            /* Report errors on unused parameters. */
-        // "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
-        // "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
-        /* Module Resolution Options */
-        // "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
-        // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
-        // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
-        // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
-        // "typeRoots": [],                       /* List of folders to include type definitions from. */
-        // "types": [],                           /* Type declaration files to be included in compilation. */
-        // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-        "esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
-        // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
-        // "allowUmdGlobalAccess": true,          /* Allow accessing UMD globals from modules. */
-        /* Source Map Options */
-        // "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
-        // "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */
-        // "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
-        // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
-        /* Experimental Options */
-        // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
-        // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
-        /* Advanced Options */
-        "skipLibCheck": true, /* Skip type checking of declaration files. */
-        "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
-    }
-}

aqua-examples/aqua-ipfs-integration/nodejs/demo.ts

@@ -20,7 +20,11 @@ import { provideFile } from "./provider";
 import { set_timeout } from "@fluencelabs/aqua-ipfs-ts";
 import { createClient, setLogLevel } from "@fluencelabs/fluence";
 import { stage, krasnodar, Node, testNet } from "@fluencelabs/fluence-network-environment";
-import { deploy_service, put_file_size, remove_service } from "@fluencelabs/ipfs-execution-aqua";
+import {
+  deploy_service,
+  put_file_size,
+  remove_service,
+} from "../../aqua-ts/process";
 import { globSource, urlSource }from 'ipfs-http-client';
 
 async function main(environment: Node[]) {

aqua-examples/aqua-ipfs-integration/nodejs/package.json

@@ -24,7 +24,6 @@
   "author": "Fluence Labs",
   "license": "MIT",
   "dependencies": {
-    "@fluencelabs/ipfs-execution-aqua": "file:../aqua",
     "@fluencelabs/aqua-ipfs-ts": "0.3.4",
     "@fluencelabs/fluence": "0.9.53",
     "@fluencelabs/fluence-network-environment": "1.0.10",

aqua-examples/aqua-ipfs-integration/nodejs/tsconfig.json

@@ -1,4 +1,8 @@
 {
+    "include": [
+        "src",
+        "../aqua-ts/"
+    ],
     "compilerOptions": {
         /* Visit https://aka.ms/tsconfig.json to read more about this file */
         /* Basic Options */

aqua-examples/aqua-ipfs-integration/web/package.json

@@ -3,7 +3,6 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@fluencelabs/ipfs-execution-aqua": "file:../aqua",
     "@fluencelabs/aqua-ipfs-ts": "0.3.4",
     "@fluencelabs/fluence": "0.9.53",
     "@fluencelabs/fluence-network-environment": "1.0.10",

aqua-examples/aqua-ipfs-integration/web/src/appLogic.ts

@@ -6,7 +6,7 @@ import {
   deploy_service,
   put_file_size,
   remove_service,
-} from "@fluencelabs/ipfs-execution-aqua";
+} from "../../aqua-ts/process";
 import {
   clientState,
   rpcAddrState,

aqua-examples/aqua-ipfs-integration/web/tsconfig.json

@@ -18,9 +18,14 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
-    "jsx": "react-jsx"
+    "jsx": "react-jsx",
   },
   "include": [
-    "src"
-  ]
+    "src",
+    "../aqua-ts/"
+  ],
+  "filesGlob": [
+    "**/*.ts", //Local source, this is the default
+    "../../aqua-ts/**/*.ts" //generated source
+  ], 
 }