lincd-cli 0.1.19 → 0.1.20

package/defaults/app/package.json

@@ -22,7 +22,7 @@
     "web3"
   ],
   "dependencies": {
-    "lincd": "^0.3"
+    "lincd": "^0.3.6"
   },
   "devDependencies": {
     "lincd-cli": "^0.1"

package/defaults/app/tsconfig.json

@@ -4,15 +4,18 @@
     "sourceMap": true,
     "target": "es6",
     "outDir": "lib",
-    "declaration": true,
+    "declaration": false,
     "esModuleInterop": true,
+    "moduleResolution": "node",
     "resolveJsonModule": true,
     "downlevelIteration": true,
     "experimentalDecorators": true,
     "skipLibCheck": true,
     "jsx": "react",
-    "baseUrl": "./",
-    "rootDir": "src"
+    "paths": {
+      "react": ["../node_modules/@types/react","../../../node_modules/@types/react"]
+    },
+    "baseUrl": "./src"
   },
   "files": ["./src/index.tsx"]
 }

package/defaults/app-with-backend/package.json

@@ -33,7 +33,7 @@
     "@babel/preset-react": "^7.18.6",
     "@babel/preset-typescript": "^7.18.6",
     "@babel/register": "^7.18.9",
-    "lincd": "^0.3",
+    "lincd": "^0.3.6",
     "lincd-jsonld": "^0.1.5",
     "lincd-server": "^0.1",
     "react": "^18.2",

package/defaults/app-with-backend/tsconfig.json

@@ -11,6 +11,9 @@
     "resolveJsonModule": true,
     "jsx": "react-jsx",
     "types": ["node", "react", "react-dom"],
+    "paths": {
+      "react": ["../node_modules/@types/react","../../../node_modules/@types/react"]
+    },
     "pretty": true
   },
   "files": ["./frontend/src/index.tsx"]

package/defaults/module/package.json

@@ -29,7 +29,7 @@
     "web3"
   ],
   "dependencies": {
-    "lincd": "^0.3",
+    "lincd": "^0.3.6",
     "lincd-jsonld": "^0.1"
   },
   "devDependencies": {

package/defaults/module/src/components/ExampleComponent.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import {ExampleShapeClass} from "../shapes/ExampleShapeClass";
-import {linkedComponentClass,linkedComponent} from '../module';
+import {linkedComponentClass,linkedComponent} from '../package';
 import {LinkedComponentClass} from 'lincd/lib/utils/LinkedComponentClass';
 
 export const ExampleComponent = linkedComponent<ExampleShapeClass>(ExampleShapeClass, ({source, sourceShape}) => {

package/defaults/module/src/ontologies/example-ontology.ts

@@ -1,7 +1,7 @@
 import {NamedNode} from 'lincd/lib/models';
 import {JSONLD} from 'lincd-jsonld/lib/utils/JSONLD';
 import {createNameSpace} from 'lincd/lib/utils/NameSpace';
-import {linkedOntology} from '../module';
+import {linkedOntology} from '../package';
 //import all the exports of this file as one variable called _this (we need this at the end)
 import * as _this from './${hyphen_name}';
 

package/defaults/module/src/{module.ts → package.ts}

@@ -1,4 +1,4 @@
-import {linkedModule} from 'lincd/lib/utils/Module';
+import {linkedPackage} from 'lincd/lib/utils/Module';
 
 export const {linkedComponent, linkedComponentClass, linkedShape, linkedUtil, linkedOntology} =
-  linkedModule('${module_name}');
+  linkedPackage('${module_name}');

package/defaults/module/src/shapes/ExampleShapeClass.ts

@@ -1,6 +1,6 @@
 import {Shape} from 'lincd/lib/shapes/Shape';
 import {Literal, NamedNode} from 'lincd/lib/models';
-import {linkedShape} from '../module';
+import {linkedShape} from '../package';
 import {literalProperty} from 'lincd/lib/utils/ShapeDecorators';
 import {${camel_name}} from '../ontologies/${hyphen_name}';
 

package/defaults/module/tsconfig.json

@@ -3,16 +3,20 @@
     "module": "commonjs",
     "sourceMap": true,
     "target": "es6",
+    "moduleResolution": "node",
     "outDir": "lib",
     "declaration": true,
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
     "esModuleInterop": true,
     "resolveJsonModule": true,
     "downlevelIteration": true,
-    "experimentalDecorators": true,
-    "skipLibCheck": true,
     "jsx": "react",
-    "baseUrl": "./",
-    "rootDir": "src"
+    "types": ["node"],
+    "paths": {
+      "react": ["../node_modules/@types/react","../../../node_modules/@types/react"]
+    },
+    "baseUrl": "./src"
   },
   "files": ["./src/index.ts"]
 }

package/defaults/shape.ts

@@ -1,6 +1,6 @@
 import {Shape} from 'lincd/lib/shapes/Shape';
 import {NamedNode} from 'lincd/lib/models';
-import {linkedShape} from '../module';
+import {linkedShape} from '../package';
 
 @linkedShape
 export class ${camel_name} extends Shape {

package/lib/cli.js

@@ -36,6 +36,22 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
 var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
         if (ar || !(i in from)) {
@@ -324,7 +340,7 @@ function buildAll(target, target2) {
                             });
                             if (dependentModules.length > 0) {
                                 failedModules.push(module.moduleName);
-                                printFailedModules(failedModules);
+                                printBuildResults(failedModules, done);
                                 console.log(chalk.magenta('Stopping build process because an error occurred whilst building ' +
                                     module.moduleName +
                                     ', which ' +
@@ -341,11 +357,19 @@ function buildAll(target, target2) {
                             }
                         })
                             .then(function (res) {
+                            // console.log("RESULT: ",res);
+                            // if(res && res.includes("Aborted due to warnings"))
+                            // {
+                            //   failedModules.push(module.moduleName);
+                            // }
+                            // else
+                            // {
                             done.add(module);
+                            // }
                             modulesLeft--;
                             log(chalk.magenta(modulesLeft + ' modules left'));
-                            if (modulesLeft == 0 && failedModules.length > 0) {
-                                printFailedModules(failedModules);
+                            if (modulesLeft == 0) {
+                                printBuildResults(failedModules, done);
                             }
                             return res;
                         });
@@ -450,7 +474,7 @@ function getLincdModules(rootPath) {
     var pack = (0, utils_1.getPackageJSON)();
     if (!pack || !pack.workspaces) {
         for (var i = 0; i <= 3; i++) {
-            rootPath = path.join.apply(path, __spreadArray([process.cwd()], Array(i).fill('..'), false));
+            rootPath = path.join.apply(path, __spreadArray([process.cwd()], __read(Array(i).fill('..')), false));
             pack = (0, utils_1.getPackageJSON)(rootPath);
             if (pack && pack.workspaces) {
                 // log('Found workspace at '+packagePath);
@@ -660,7 +684,7 @@ var replaceVariablesInFilesWithRoot = function (root) {
     for (var _i = 1; _i < arguments.length; _i++) {
         files[_i - 1] = arguments[_i];
     }
-    return replaceVariablesInFiles.apply(void 0, files.map(function (f) { return path.join(root, f); }));
+    return replaceVariablesInFiles.apply(void 0, __spreadArray([], __read(files.map(function (f) { return path.join(root, f); })), false));
 };
 var hasYarnInstalled = function () {
     return __awaiter(this, void 0, void 0, function () {
@@ -756,7 +780,7 @@ var createModule = function (name, uriBase, basePath) {
                         console.warn('Please provide a name as the first argument');
                         return [2 /*return*/];
                     }
-                    _a = name.match(/(@[\w\-]+\/)?([\w\-]+)/), packageName = _a[0], scope = _a[1], cleanPackageName = _a[2];
+                    _a = __read(name.match(/(@[\w\-]+\/)?([\w\-]+)/), 3), packageName = _a[0], scope = _a[1], cleanPackageName = _a[2];
                     targetFolder = ensureFolderExists(basePath, cleanPackageName);
                     if (!uriBase) {
                         uriBase = 'http://lincd.org/ont/' + name;
@@ -779,7 +803,7 @@ var createModule = function (name, uriBase, basePath) {
                             'src/index.ts',
                             'package.json',
                             'Gruntfile.js',
-                            'src/module.ts',
+                            'src/package.ts',
                             'src/shapes/ExampleShapeClass.ts',
                             'src/ontologies/example-ontology.ts',
                             'src/data/example-ontology.json',
@@ -798,11 +822,11 @@ var createModule = function (name, uriBase, basePath) {
                         'src/data/example-ontology.json.d.ts',
                     ].forEach(function (f) {
                         var parts = f.split('/');
-                        var newParts = __spreadArray([], parts, true);
-                        var _a = newParts.pop().split('.'), name = _a[0], extensions = _a.slice(1);
+                        var newParts = __spreadArray([], __read(parts), false);
+                        var _a = __read(newParts.pop().split('.')), name = _a[0], extensions = _a.slice(1);
                         var newName = hyphenName + '.' + extensions.join('.');
-                        console.log('rename ', path.join(targetFolder, f), path.join.apply(path, __spreadArray(__spreadArray([targetFolder], newParts, false), [newName], false)));
-                        fs.renameSync(path.join(targetFolder, f), path.join.apply(path, __spreadArray(__spreadArray([targetFolder], newParts, false), [newName], false)));
+                        console.log('rename ', path.join(targetFolder, f), path.join.apply(path, __spreadArray(__spreadArray([targetFolder], __read(newParts), false), [newName], false)));
+                        fs.renameSync(path.join(targetFolder, f), path.join.apply(path, __spreadArray(__spreadArray([targetFolder], __read(newParts), false), [newName], false)));
                     });
                     return [4 /*yield*/, execPromise('yarn --version')["catch"](function (err) {
                             console.log('yarn probably not working');
@@ -893,17 +917,17 @@ var buildFailed = function (output) {
         // require('lincd');
         //TODO: replace with actual index file from package.json, or tsconfig
         let indexExports = require(process.cwd() + '/lib/index.js');
-        if(indexExports.moduleExports)
+        if(indexExports.packageExports)
         {
-            let shapeJSONLD = await getShapesJSONLD(indexExports.moduleExports);
-            console.log(indexExports.moduleExports);
+            let shapeJSONLD = await getShapesJSONLD(indexExports.packageExports);
+            console.log(indexExports.packageExports);
             console.log(shapeJSONLD);
             console.log(chalk.bold(chalk.green(moduleName+'/dist/shapes.json')));
             return fs.writeFile(path.join('dist', 'shapes.json'), shapeJSONLD);
         }
         else
         {
-            console.warn("Invalid LINCD module. Index file should export a moduleExports object. See examples.")
+            console.warn("Invalid LINCD module. Index file should export a packageExports object. See examples.")
         }
 
     } else {
@@ -917,7 +941,11 @@ var register = function (registryURL) {
         var moduleName = pack.name;
         var author = pack.author;
         var description = pack.description;
-        console.log(chalk.cyan('registering ' + author + "'s module, " + moduleName + ' ' + version + ' in the LINCD registry'));
+        var authorName = pack.author;
+        if (pack.author.name) {
+            authorName = pack.author.name;
+        }
+        console.log(chalk.cyan('registering ' + authorName + "'s module, " + moduleName + ' ' + version + ' in the LINCD registry'));
         return fetch(registryURL + '/register', {
             method: 'POST',
             headers: {
@@ -1189,8 +1217,11 @@ var buildUpdated = function (back, target, target2, test) {
     });
     // });
 };
-var printFailedModules = function (modules) {
-    log('These modules failed to build:\n\t' + chalk.red(modules.join('\n\t')) + '\n');
+var printBuildResults = function (failed, done) {
+    log('Build results: '
+        + chalk.green(__spreadArray([], __read(done), false).map(function (m) { return m.moduleName; }).join(', '))
+        + (failed.length > 0 ? (', ' + chalk.red(failed.join(', '))) : '')
+        + '\n');
 };
 var executeCommandForEachModule = function (modules, command, includedSpaces, excludedSpaces) {
     //if a specific set of modules is given

package/lib/config-grunt.js

@@ -1,4 +1,20 @@
 "use strict";
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
 var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
         if (ar || !(i in from)) {
@@ -56,7 +72,7 @@ function setupGrunt(grunt, moduleName, config) {
     grunt.registerTask('dev', targetES6 ? ['prepare-build', 'dev-es6'] : ['prepare-build', 'dev-es5']);
     grunt.registerTask('build', targets.map(function (target) { return 'build-' + target; }));
     if (buildFrontend) {
-        grunt.registerTask('build-frontend', __spreadArray(['prepare-build'], targets.map(function (target) { return 'webpack:build-' + target; }), true));
+        grunt.registerTask('build-frontend', __spreadArray(['prepare-build'], __read(targets.map(function (target) { return 'webpack:build-' + target; })), false));
     }
     grunt.registerTask('build-production', (0, utils_1.flatten)([
         'clean:lib',

package/lib/config-webpack.js

@@ -110,7 +110,7 @@ function generateWebpackConfig(buildName, moduleName, config) {
     if (config.analyse) {
         plugins.push(new BundleAnalyzerPlugin());
     }
-    if (es6 || config.declarations === true) {
+    if ((es6 || config.declarations === true) && !config.declarations === false) {
         plugins.push(new declaration_plugin_1["default"]({
             out: (config.filename ? config.filename : cleanModuleName) + '.d.ts',
             root: config.outputPath ? config.outputPath : './lib/',

package/lib/plugins/declaration-plugin.js

@@ -60,13 +60,16 @@ var DeclarationPlugin = /** @class */ (function () {
                     }
                 });
                 if (Object.keys(_this.declarationFiles).length == 0) {
-                    _this.log('Cannot build .d.ts file because no declarations where found.'.red);
-                    _this.log('Make sure to add '.yellow + '"declaration":true'.blue.bold['underline'] + ' to tsconfig.json'.yellow);
-                    _this.log('Make sure to run '.yellow + 'tsc'.blue + ' before running webpack'.yellow);
-                    _this.log('Make sure to test for '.yellow +
-                        '/(?!.*.d.ts).ts(x?)$/'.blue.bold['underline'] +
-                        ' in the ts-loader in webpack.config.json'.yellow);
-                    _this.log(('Assets: ' + Object.keys(compilation.assets).toString()).yellow);
+                    _this.debug('Didn\'t build .d.ts file because no declaration assets were emitted during build process.'.yellow);
+                    _this.debug('This is likely because webpack is using cache.'.yellow);
+                    _this.debug('In watch mode, declaration assets will be emitted once you change a ts(x) source file'.yellow);
+                    // this.log('Make sure to run '.yellow + 'tsc'.blue + ' before running webpack'.yellow);
+                    // this.log(
+                    //   'Make sure to test for '.yellow +
+                    //   '/(?!.*.d.ts).ts(x?)$/'.blue.bold['underline'] +
+                    //   ' in the ts-loader in webpack.config.json'.yellow,
+                    // );
+                    // this.log(('Assets: ' + Object.keys(compilation.assets).toString()).yellow);
                     // callback();
                     return;
                 }

package/lib/plugins/externalise-modules.js

@@ -1,4 +1,20 @@
 "use strict";
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
 exports.__esModule = true;
 /// <reference path="colors.d.ts" />
 var colors = require("colors");
@@ -94,7 +110,7 @@ var externaliseModules = function (config, es5) {
         // --> match[0] = @dacore/some-mod
         // --> match[1] = @dacore
         // --> match[2] = some-mod
-        var _b = request.match(/(@[\w\-]+\/)?([\w\-]+)/), packageName = _b[0], scope = _b[1], cleanPackageName = _b[2];
+        var _b = __read(request.match(/(@[\w\-]+\/)?([\w\-]+)/), 3), packageName = _b[0], scope = _b[1], cleanPackageName = _b[2];
         //if this module is listed as internal module in the config (or if we internalize all modules with '*')
         if (config && config.internals && (config.internals.indexOf(packageName) !== -1 || config.internals === '*')) {
             //then don't exclude and don't continue this function

package/lib/utils.js

@@ -22,16 +22,38 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-exports.flatten = exports.warn = exports.debug = exports.log = exports.generateScopedName = exports.getShapes = exports.getShapesJSONLD = exports.getPackageJSON = void 0;
+exports.flatten = exports.warn = exports.debug = exports.log = exports.generateScopedName = exports.getPackageJSON = void 0;
 var fs = __importStar(require("fs"));
 var path = __importStar(require("path"));
-var SHACL_1 = require("lincd/lib/shapes/SHACL");
-var CoreSet_1 = require("lincd/lib/collections/CoreSet");
-var JSONLDWriter_1 = require("lincd-jsonld/lib/utils/JSONLDWriter");
 var chalk_1 = __importDefault(require("chalk"));
 var getPackageJSON = function (root, error) {
     if (root === void 0) { root = process.cwd(); }
@@ -48,25 +70,24 @@ var getPackageJSON = function (root, error) {
     }
 };
 exports.getPackageJSON = getPackageJSON;
-function getShapesJSONLD(moduleExports) {
-    return JSONLDWriter_1.JSONLDWriter.stringify(getShapes(moduleExports));
+/*export function getShapesJSONLD(packageExports): Promise<string> {
+  // return JSONLDWriter.stringify(getShapes(packageExports));
 }
-exports.getShapesJSONLD = getShapesJSONLD;
-function getShapes(moduleExports) {
-    var shapes = new CoreSet_1.CoreSet();
-    for (var key in moduleExports) {
-        var moduleExport = moduleExports[key];
-        // console.log(key, Object.keys(moduleExports[key]));
-        if (moduleExport.shape) {
-            // console.log(Object.keys(moduleExport.shape));
-            if (moduleExport.shape && moduleExport.shape instanceof SHACL_1.SHACL_Shape) {
-                shapes.add(moduleExport.shape);
-            }
-        }
+
+export function getShapes(packageExports): CoreSet<SHACL_Shape> {
+  let shapes = new CoreSet<SHACL_Shape>();
+  for (var key in packageExports) {
+    let moduleExport = packageExports[key];
+    // console.log(key, Object.keys(packageExports[key]));
+    if (moduleExport.shape) {
+      // console.log(Object.keys(moduleExport.shape));
+      if (moduleExport.shape && moduleExport.shape instanceof SHACL_Shape) {
+        shapes.add(moduleExport.shape);
+      }
     }
-    return shapes;
-}
-exports.getShapes = getShapes;
+  }
+  return shapes;
+}*/
 function generateScopedName(name, filename, css) {
     var path = require('path');
     var file = path.basename(filename, '.scss');
@@ -112,7 +133,7 @@ function debug(config) {
         messages[_i - 1] = arguments[_i];
     }
     if (config.debug) {
-        log.apply(void 0, messages);
+        log.apply(void 0, __spreadArray([], __read(messages), false));
     }
 }
 exports.debug = debug;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lincd-cli",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "description": "Command line tools for the lincd.js library",
   "main": "lib/index.js",
   "scripts": {
@@ -51,7 +51,7 @@
     "grunt-ts": "^6.0.0-beta.22",
     "grunt-webpack": "^5.0.0",
     "license-info-webpack-plugin": "^3.0.0",
-    "lincd": "^0.3",
+    "lincd": "^0.3.6",
     "lincd-jsonld": "^0.1.4",
     "load-grunt-tasks": "^5.1.0",
     "mini-css-extract-plugin": "^2.6.1",
@@ -72,7 +72,7 @@
     "ts-node": "10.7",
     "tsc-hooks": "^1.1.1",
     "tsconfig-paths-webpack-plugin": "^4.0.0",
-    "typescript": "4.6.4",
+    "typescript": "4.8.4",
     "webpack": "^5.74.0",
     "webpack-bundle-analyzer": "^4.6.1",
     "webpack-license-plugin": "^4.2.2"