lincd-cli 0.1.9 → 0.1.10

package/defaults/app/src/App.tsx

@@ -0,0 +1,5 @@
+import React from 'react';
+export function App()
+{
+  return <div>${app_name} - LINCD App</div>;
+}

package/defaults/app/src/index.tsx

@@ -0,0 +1,10 @@
+import React from 'react';
+import {createRoot} from 'react-dom/client';
+import {App} from './App';
+
+declare var document;
+if (typeof document !== 'undefined') {
+  const container = document.getElementById('root');
+  const root = createRoot(container!);
+  root.render(<App></App>);
+}

package/defaults/app/tsconfig.json

@@ -0,0 +1,18 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "sourceMap": true,
+    "target": "es6",
+    "outDir": "lib",
+    "declaration": true,
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+    "downlevelIteration": true,
+    "experimentalDecorators": true,
+    "skipLibCheck": true,
+    "jsx": "react",
+    "baseUrl": "./",
+    "rootDir": "src"
+  },
+  "files": ["./src/index.tsx"]
+}

package/defaults/module/Gruntfile.js

@@ -0,0 +1,16 @@
+var buildTools = require('lincd-cli');
+module.exports = buildTools.generateGruntConfig('${module_name}', {
+	externals: {
+		react: 'React',
+		'react-dom': 'ReactDOM',
+	}, //list of non lincd modules that are already loaded and made globally available by one of the dependencies of this module
+	//internals: [],//list of lincd modules that you want to INCLUDE in the bundle (as opposed to the module its own bundle being a dependency)
+	//alias:{},//webpack alias -> maps on type of npm path to another
+	//target:"es5"|"es6",
+	//environment:"server"|"frontend",
+	//outputPath:string,
+	//es5Server:boolean
+	//es5:{},//es5 specific config, use same properties as above
+	//es6:{},//es6 specific config, use same properties as above
+	//debug:false,//debug the build process
+});

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

@@ -0,0 +1,20 @@
+import React from "react";
+import {ExampleShapeClass} from "../shapes/ExampleShapeClass";
+import {linkedComponentClass,linkedComponent} from '../module';
+import {LinkedComponentClass} from 'lincd/lib/utils/LinkedComponentClass';
+
+export const ExampleComponent = linkedComponent<ExampleShapeClass>(ExampleShapeClass, ({source, sourceShape}) => {
+  //note that typescript knows that person has the type of the Shape you provided
+  return <div></div>;
+});
+
+//alternatively, use a Class component if you prefer:
+/*@linkedComponentClass(ExampleShapeClass)
+export class ExampleComponent extends LinkedComponentClass<ExampleShapeClass> {
+  render() {
+    let exampleInstance = this.sourceShape;
+
+    //get the name of this item from the graph
+    return <h1>Hello {exampleInstance.name}!</h1>;
+  }
+}*/

package/defaults/module/src/data/example-ontology.json

@@ -0,0 +1,20 @@
+{
+  "@context": {
+    "dc": "http://purl.org/dc/elements/1.1/",
+    "owl": "http://www.w3.org/2002/07/owl#",
+    "rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
+    "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
+    "${hyphen_name}": "${uri_base}"
+  },
+  "@graph": [
+    {
+      "@id": "${hyphen_name}:ExampleClass",
+      "@type": "rdfs:Class",
+      "rdfs:comment": "This is an example class. You can remove or rename it",
+      "rdfs:isDefinedBy": {
+        "@id": "${hyphen_name}:"
+      },
+      "rdfs:label": "Example Class"
+    }
+  ]
+}

package/defaults/module/src/data/example-ontology.json.d.ts

@@ -0,0 +1 @@
+export var json: string;

package/defaults/module/src/index.ts

@@ -0,0 +1,7 @@
+import './ontologies/${hyphen_name}';
+
+//SHAPES FIRST
+import './shapes/ExampleShapeClass';
+
+//THEN COMPONENTS
+import './components/ExampleComponent';

package/defaults/module/src/module.ts

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

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

@@ -0,0 +1,36 @@
+import {NamedNode} from 'lincd/lib/models';
+import {JSONLD} from 'lincd-jsonld/lib/JSONLD';
+import {createNameSpace} from 'lincd/lib/utils/NameSpace';
+import {linkedOntology} from '../module';
+//import all the exports of this file as one variable called _this (we need this at the end)
+import * as _this from './${hyphen_name}';
+
+/**
+ * Load the data of this ontology into memory, thus adding the properties of the entities of this ontology to the local graph.
+ */
+export var loadData = () => {
+  return import('../data/${hyphen_name}.json').then((data) => JSONLD.parse(data));
+};
+
+/**
+ * The namespace of this ontology, which can be used to create NamedNodes with URI's not listed in this file
+ */
+export var ns = createNameSpace('${uri_base}');
+
+/**
+ * The NamedNode of the ontology itself
+ */
+export var _self: NamedNode = ns('');
+
+//A list of all the entities (Classes & Properties) of this ontology, each exported as a NamedNode
+export var ExampleClass: NamedNode = ns('ExampleClass');
+export var exampleProperty: NamedNode = ns('exampleProperty');
+
+//An extra grouping object so all the entities can be accessed from the prefix/name
+export const ${camel_name} = {
+  ExampleClass,
+  exampleProperty,
+};
+
+//Registers this ontology to LINCD.JS, so that data loading can be automated amongst other things
+linkedOntology(_this, ns, '${hyphen_name}', loadData, '../data/${hyphen_name}.json');

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

@@ -0,0 +1,29 @@
+import {Shape} from 'lincd/lib/shapes/Shape';
+import {Literal, NamedNode} from 'lincd/lib/models';
+import {linkedShape} from '../module';
+import {literalProperty} from 'lincd/lib/utils/ShapeDecorators';
+import {${camel_name}} from '../ontologies/${hyphen_name}';
+
+@linkedShape
+export class ExampleShapeClass extends Shape {
+  /**
+   * indicates that instances of this shape need to have this rdf.type
+   */
+  static targetClass: NamedNode = ${camel_name}.ExampleClass;
+
+  /**
+   * instances of this shape need to have exactly one value defined for the given property
+   */
+  @literalProperty({
+    path: ${camel_name}.exampleProperty,
+    required: true,
+    maxCount: 1,
+  })
+  get name() {
+    return this.getValue(${camel_name}.exampleProperty);
+  }
+
+  set name(val: string) {
+    this.overwrite(${camel_name}.exampleProperty, new Literal(val));
+  }
+}

package/defaults/module/tsconfig-es5.json

@@ -0,0 +1,18 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "sourceMap": true,
+    "target": "es5",
+    "outDir": "lib",
+    "declaration": false,
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+    "downlevelIteration": true,
+    "experimentalDecorators": true,
+    "skipLibCheck": true,
+    "jsx": "react",
+    "baseUrl": "./",
+    "rootDir": "src"
+  },
+  "files": ["./src/index.ts"]
+}

package/defaults/module/tsconfig.json

@@ -0,0 +1,18 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "sourceMap": true,
+    "target": "es6",
+    "outDir": "lib",
+    "declaration": true,
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+    "downlevelIteration": true,
+    "experimentalDecorators": true,
+    "skipLibCheck": true,
+    "jsx": "react",
+    "baseUrl": "./",
+    "rootDir": "src"
+  },
+  "files": ["./src/index.ts"]
+}

package/lib/cli.js

@@ -56,6 +56,104 @@ var path = require('path');
 var glob = require('glob');
 var variables = {};
 var open = require('open');
+program
+    .command('create-app')
+    .action(function (name) {
+    return createApp(name);
+})
+    .description('Creates a new folder with all the required files for a LINCD app')
+    .argument('<name>', 'the name of your LINCD app');
+program
+    .command('create-module')
+    .action(function (name, uriBase) {
+    return createModule(name, uriBase);
+})
+    .description('Create a new folder with all the required files for a new LINCD module')
+    .argument('<name>', 'The name of the module. Will be used as package name in package.json')
+    .argument('[uri_base]', 'The base URL used for data of this module. Leave blank to use the URL of your module on lincd.org after you register it');
+program
+    .command('create-shape')
+    .action(function (name, uriBase) {
+    return createShape(name);
+})
+    .description('Creates a new ShapeClass file for your module. Execute this from your module folder.')
+    .argument('<name>', 'The name of the shape. Will be used for the file name and the class name');
+program
+    .command('create-ontology')
+    .action(function (prefix, uriBase) {
+    return createOntology(prefix, uriBase);
+})
+    .description('Creates a new ontology file for your module. Execute this from your module folder.')
+    .argument('<suggested-prefix>', 'The suggested prefix for your ontology. Also the shorthand code used for the file name and the exported ontology object')
+    .argument('[uribase]', "Optional argument to set the URI base for the URI's of all entities in your ontology. Leave blank to use the URI's provided by lincd.org once you register this module");
+program.command('register-local', { hidden: true }).action(function () {
+    register('http://localhost:4001');
+});
+program.command('register-dev', { hidden: true }).action(function () {
+    register('https://dev-registry.lincd.org');
+});
+program
+    .command('register')
+    .action(function () {
+    register('https://registry.lincd.org');
+})
+    .description('Register (a new version of) this module to the LINCD registry. If successful your module will appear on www.lincd.org');
+program
+    .command('info')
+    .action(function () {
+    var ownPackage = JSON.parse(fs.readFileSync(path.join(__dirname, 'package.json'), 'utf8'));
+    console.log(ownPackage.version);
+    console.log('Running from: ' + __dirname);
+})
+    .description("Log the version of this tool and the path that it's running from");
+program.command('build [target] [target2]', { isDefault: true }).action(function (target, target2) {
+    buildModule(target, target2);
+});
+program.command('publish-updated').action(function () {
+    return publishUpdated();
+});
+program.command('status').action(function () {
+    return publishUpdated(true).then(function () {
+        return buildUpdated(undefined, '', '', true);
+    });
+});
+program.command('build-updated [target] [target2]').action(function (target, target2) {
+    return buildUpdated(1, target, target2);
+});
+program.command('build-updated-since [num-commits-back] [target] [target2]').action(function (back, target, target2) {
+    return buildUpdated(back, target, target2);
+});
+program.command('build-all [target] [target2]').action(function (target, target2) {
+    buildAll(target, target2);
+});
+program.command('modules [action] [includedSpaces]').action(function (command, includedSpaces) {
+    executeCommandForEachModule(getLincdModules(), command, includedSpaces);
+});
+program.command('modules-except [excludedSpaces] [action]').action(function (excludedSpaces, command) {
+    executeCommandForEachModule(getLincdModules(), command, null, excludedSpaces);
+});
+program.command('dev [target] [mode]').action(function (target, mode) {
+    developModule(target, mode);
+});
+program
+    .command('module|m')
+    .action(function (name, command, args) {
+    var fullCommand = (command ? command + ' ' +
+        ' ' +
+        args
+            .slice(0, 3)
+            .filter(function (a) { return a && true; })
+            .join(' ') : null);
+    executeCommandForModule(name, fullCommand);
+})
+    .alias('m')
+    .description("Searches for a module in this workspace with a partially matching name and executes a command for that module (without needing to execute it from that modules' folder)")
+    .argument('<name>', 'the name of the module. Can be a part of the name.')
+    .argument('[command]', 'the lincd command you want to execute. Like dev or build')
+    .argument('[args...]', 'the additional arguments of that command');
+function logHelp() {
+    execp('yarn lincd help');
+}
 function log() {
     var messages = [];
     for (var _i = 0; _i < arguments.length; _i++) {
@@ -75,6 +173,25 @@ function warn() {
         // console.log(chalk.red(message));
     });
 }
+function developModule(target, mode) {
+    if (!target)
+        target = 'es6';
+    if (mode !== 'production')
+        mode = '';
+    else if (target !== 'es6')
+        log('target must be es6 when developing for production');
+    if (target == 'es5' || target == 'es6') {
+        // log('> Starting continuous development build for '+target+' target')
+        log('starting continuous development build');
+        log('grunt dev' + (target ? '-' + target : '') + (mode ? '-' + mode : '') + ' --color');
+        var command = exec('grunt dev' + (target ? '-' + target : '') + (mode ? '-' + mode : '') + ' --color');
+        command.stdout.pipe(process.stdout);
+        command.stderr.pipe(process.stderr);
+    }
+    else {
+        console.warn('unknown build target. Use es5 or es6');
+    }
+}
 function checkWorkspaces(rootPath, workspaces, res) {
     // console.log('checking workspaces at '+rootPath+": "+workspaces.toString());
     workspaces.forEach(function (workspace) {
@@ -113,6 +230,194 @@ function checkModulePath(rootPath, modulePath, res) {
         }
     }
 }
+function buildAll(target, target2) {
+    var _this = this;
+    var dependencies = new Map();
+    console.log('Building all modules of this repository in order of dependencies');
+    var modules = getLocalLincdModuleMap();
+    //get dependencies of each module
+    var leastDependentModule;
+    modules.forEach(function (module) {
+        var pack = (0, utils_1.getPackageJSON)(module.path);
+        if (pack) {
+            //get lincd related dependencies and get the actual module details from the module map by removing '@dacore/' from the package name
+            var moduleDependencies = Object.keys(pack.dependencies)
+                .filter(function (dependency) { return modules.has(dependency); })
+                .map(function (dependency) {
+                return modules.has(dependency) ? modules.get(dependency) : dependency;
+            });
+            // console.log(module.moduleName,moduleDependencies.map())
+            dependencies.set(module, moduleDependencies);
+        }
+    });
+    dependencies.forEach(function (moduleDependencies, module) {
+        if (!moduleDependencies.some(function (dependency) {
+            return typeof dependency !== 'string' && modules.has(dependency.moduleName);
+        })) {
+            leastDependentModule = module;
+        }
+    });
+    var startFrom;
+    //by default start building
+    var building = true;
+    //option to start from a specific module in the stack
+    if (target == 'from') {
+        startFrom = target2;
+        //if we have a startFrom, then we havnt started the build process yet
+        building = startFrom ? false : true;
+        //clear targets
+        target = '';
+        target2 = '';
+        console.log(chalk.blue('Will skip builds until ' + startFrom));
+    }
+    var stack = [leastDependentModule];
+    var done = new Set();
+    var p = Promise.resolve();
+    var runStack = function () { return __awaiter(_this, void 0, void 0, function () {
+        var modulesLeft, failedModules, stackPromise, first_1;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    modulesLeft = modules.size - done.size;
+                    if (done.size > 0) {
+                        console.log(chalk.magenta('\n-------\nThese modules are next, since all their dependencies have now been build:'));
+                        console.log(chalk.magenta(stack.map(function (i) { return i.moduleName; })));
+                        // log(stack);
+                    }
+                    failedModules = [];
+                    stackPromise = Promise.all(stack.map(function (module) {
+                        // p = p.then(() => {
+                        var command;
+                        //if we're skipping builds until a certain module
+                        if (!building) {
+                            //if the module name matches the module we're supposed to start from then start building modules
+                            if (module.moduleName == startFrom || module.packageName == startFrom) {
+                                building = true;
+                            }
+                            //else still waiting for the module
+                            else {
+                                log(chalk.blue('skipping ' + module.moduleName));
+                                command = Promise.resolve(true);
+                            }
+                        }
+                        //unless told otherwise, build the module
+                        if (!command) {
+                            command = execp('cd ' +
+                                module.path +
+                                ' && yarn lincd build' +
+                                (target ? ' ' + target : '') +
+                                (target2 ? ' ' + target2 : ''));
+                            log(chalk.cyan('Building ' + module.moduleName));
+                        }
+                        return command["catch"](function (err) {
+                            var dependentModules = [];
+                            dependencies.forEach(function (dModuleDependencies, dModule) {
+                                if (dModuleDependencies.indexOf(module) !== -1) {
+                                    dependentModules.push(dModule);
+                                }
+                            });
+                            if (dependentModules.length > 0) {
+                                failedModules.push(module.moduleName);
+                                printFailedModules(failedModules);
+                                console.log(chalk.magenta('Stopping build process because an error occurred whilst building ' +
+                                    module.moduleName +
+                                    ', which ' +
+                                    dependentModules.length +
+                                    ' other modules depend on.')); //"+dependentModules.map(d => d.moduleName).join(", ")));
+                                console.log(chalk.cyanBright('tip ') +
+                                    'Run ' +
+                                    chalk.green("lincd build-all from ".concat(module.moduleName)) +
+                                    ' to build only the remaining modules'); //"+dependentModules.map(d => d.moduleName).join(", ")));
+                                process.exit(1);
+                            }
+                            else {
+                                failedModules.push(module.moduleName);
+                            }
+                        })
+                            .then(function (res) {
+                            done.add(module);
+                            modulesLeft--;
+                            log(chalk.magenta(modulesLeft + ' modules left'));
+                            if (modulesLeft == 0 && failedModules.length > 0) {
+                                printFailedModules(failedModules);
+                            }
+                            return res;
+                        });
+                        // });
+                        // done.add(module);
+                    }));
+                    //wait till stack is completed
+                    return [4 /*yield*/, stackPromise];
+                case 1:
+                    //wait till stack is completed
+                    _a.sent();
+                    // await p;
+                    //clear stack for next round
+                    stack = [];
+                    //find those modules who have all their dependencies already built and add them to the stack
+                    modules.forEach(function (module) {
+                        var deps = dependencies.get(module);
+                        //if the module is not done yet
+                        //but every dependency is now done OR was not something we can build (some @dacore dependencies may not be local)
+                        if (!done.has(module) &&
+                            deps.every(function (dependency) {
+                                return typeof dependency !== 'string' && (done.has(dependency) || !modules.has(dependency.moduleName));
+                            })) {
+                            stack.push(module);
+                        }
+                        // else if(!done.has(module))
+                        // {
+                        // 	console.log(chalk.red(module+' not yet'))
+                        // 	console.log('UNMET DEPS: '+deps.filter(dependency => !done.has(dependency)).join(" "))
+                        // }
+                    });
+                    //if more to be built, iterate
+                    if (stack.length > 0) {
+                        return [2 /*return*/, runStack()];
+                    }
+                    else {
+                        //if no more modules to build but we never started building...
+                        if (!building) {
+                            console.log(chalk.red('Could not find the module to start from. Please provide a correct package name or module name to build from'));
+                        }
+                        else {
+                            first_1 = true;
+                            modules.forEach(function (module) {
+                                if (!done.has(module)) {
+                                    var deps = dependencies.get(module);
+                                    if (first_1) {
+                                        console.log(chalk.red('CYCLICAL DEPENDENCIES? - could not build some modules because they depend on each other.'));
+                                        first_1 = false;
+                                    }
+                                    //print the cyclical dependencies
+                                    console.log(chalk.red(module.moduleName) +
+                                        ' depends on ' +
+                                        deps
+                                            .filter(function (dependency) {
+                                            return typeof dependency !== 'string';
+                                        })
+                                            .map(function (d) {
+                                            return done.has(d) ? d.moduleName : chalk.red(d.moduleName);
+                                        })
+                                            .join(', '));
+                                    //also print some information why these modules have not been moved into the stack
+                                    var stringDependencies = deps.filter(function (d) { return typeof d === 'string'; });
+                                    if (stringDependencies.length > 0) {
+                                        console.log(chalk.red('And it depends on these module(s) - which seem not to be proper modules :' +
+                                            stringDependencies.join(', ')));
+                                        console.log(chalk.red('Could you remove this from dependencies? Should it be a devDependency?'));
+                                    }
+                                }
+                            });
+                        }
+                    }
+                    return [2 /*return*/];
+            }
+        });
+    }); };
+    //starts the process
+    runStack();
+}
 /**
  * Returns a map of the modules that this repository manages (so no modules found through the workspaces who's path contains ../ )
  * @param rootPath
@@ -135,20 +440,26 @@ function getLocalLincdModules(rootPath) {
     });
 }
 function getLincdModules(rootPath) {
-    if (rootPath === void 0) { rootPath = './'; }
-    //TODO: read from package.json what the workspaces are. for each, follow up all the folders inside that path
-    //TODO: then return an array with objects that have both the module name + the path. And then use that path across this whenever this function is called
-    //TODO: this way it will work with websites as well, instead of just from the main LINCD repository
+    if (rootPath === void 0) { rootPath = process.cwd(); }
     var pack = (0, utils_1.getPackageJSON)();
-    var res = [];
-    if (!pack.workspaces) {
+    if (!pack || !pack.workspaces) {
+        for (var i = 0; i <= 3; i++) {
+            rootPath = path.join.apply(path, __spreadArray([process.cwd()], Array(i).fill('..'), false));
+            pack = (0, utils_1.getPackageJSON)(rootPath);
+            if (pack && pack.workspaces) {
+                // log('Found workspace at '+packagePath);
+                break;
+            }
+        }
+    }
+    if (!pack || !pack.workspaces) {
         warn(chalk.red('Could not find package workspaces. Make sure you run this command from a yarn workspace.'));
         logHelp();
         process.exit();
     }
-    //TODO: filter with package.lincd = true?
+    // console.log(pack.workspaces);
+    var res = [];
     checkWorkspaces(rootPath, pack.workspaces, res);
-    // console.log(res);
     return res;
 }
 function setVariable(name, replacement) {
@@ -210,12 +521,6 @@ function execp(cmd, log, allowError, options) {
         });
     });
 }
-function replaceVariables(string) {
-    for (var key in variables) {
-        string = string.replace(new RegExp(key, 'g'), variables[key]);
-    }
-    return string;
-}
 function execPromise(command, log, allowError, options) {
     if (log === void 0) { log = false; }
     if (allowError === void 0) { allowError = false; }
@@ -271,25 +576,7 @@ var camelCase = function (str) {
         .reduce(function (result, word) { return result + capitalize(word); });
     //it also leave the first capital intact
     return string;
-    // let string = str
-    //   .toLowerCase()
-    //   .replace(/[^A-Za-z0-9]/g, ' ')
-    //   .split(' ')
-    //   .reduce((result, word) => result + capitalize(word.toLowerCase()));
-    // return string.charAt(0).toLowerCase() + string.slice(1);
 };
-program.command('create-app [name] [uribase]').action(function (name, uriBase) {
-    return createApp(name, uriBase);
-});
-program.command('create-module [name] [uribase]').action(function (name, uriBase) {
-    return createModule(name, uriBase);
-});
-program.command('create-shape [name]').action(function (name, uriBase) {
-    return createShape(name);
-});
-program.command('create-ontology [suggested-prefix] [uribase]').action(function (prefix, uriBase) {
-    return createOntology(prefix, uriBase);
-});
 var createOntology = function (prefix, uriBase, basePath) {
     if (basePath === void 0) { basePath = process.cwd(); }
     return __awaiter(void 0, void 0, void 0, function () {
@@ -367,17 +654,26 @@ var ensureFolderExists = function () {
     for (var _i = 0; _i < arguments.length; _i++) {
         folders[_i] = arguments[_i];
     }
-    var targetFolder = path.join.apply(path, folders);
-    var parentDirectory = folders.slice(0, folders.length - 1);
-    if (!fs.existsSync(targetFolder)) {
-        if (fs.existsSync(path.join.apply(path, parentDirectory))) {
-            fs.mkdirSync(targetFolder);
-        }
-        else {
-            warn("Please run this command from the root of your module. This command expects ".concat(parentDirectory.toString(), " to exists from that folder"));
+    var target;
+    folders.forEach(function (folder) {
+        target = target ? path.join(target, folder) : path.join(folder);
+        if (!fs.existsSync(target)) {
+            fs.mkdirSync(target);
         }
+    });
+    return target;
+    /*let targetFolder = path.join(...folders);
+    let parentDirectory = folders.slice(0, folders.length - 1);
+    if (!fs.existsSync(targetFolder)) {
+      if (fs.existsSync(path.join(...parentDirectory))) {
+        fs.mkdirSync(targetFolder);
+      } else {
+        warn(
+          `Please run this command from the root of your module. This command expects ${parentDirectory.toString()} to exists from that folder`,
+        );
+      }
     }
-    return targetFolder;
+    return targetFolder;*/
 };
 var setNameVariables = function (name) {
     var hyphenName = name.replace(/[-_\s]+/g, '-');
@@ -497,7 +793,7 @@ var createModule = function (name, uriBase, basePath) {
         });
     });
 };
-var createApp = function (name, uriBase, basePath) {
+var createApp = function (name, basePath) {
     if (basePath === void 0) { basePath = process.cwd(); }
     return __awaiter(void 0, void 0, void 0, function () {
         var _a, packageName, scope, cleanPackageName, targetFolder, codeName, cameCaseName, underscoreName, version, installCommand;
@@ -508,9 +804,6 @@ var createApp = function (name, uriBase, basePath) {
                         console.warn('Please provide a name as the first argument');
                     }
                     _a = name.match(/(@[\w\-]+\/)?([\w\-]+)/), packageName = _a[0], scope = _a[1], cleanPackageName = _a[2];
-                    if (!uriBase) {
-                        uriBase = 'http://lincd.org/ont/' + name;
-                    }
                     targetFolder = path.join(basePath, name);
                     if (!fs.existsSync(targetFolder)) {
                         fs.mkdirSync(targetFolder);
@@ -519,7 +812,7 @@ var createApp = function (name, uriBase, basePath) {
                     codeName = cleanPackageName.replace(/\-/g, '_');
                     cameCaseName = camelCase(name);
                     underscoreName = name.replace(/[-\s]+/g, '_');
-                    setVariable('uri_base', uriBase);
+                    // setVariable('uri_base', uriBase);
                     //longer similar variables names should come before the shorter ones
                     setVariable('camelcase_name', cameCaseName);
                     setVariable('underscore_name', underscoreName);
@@ -602,16 +895,14 @@ var buildFailed = function (output) {
         console.warn('Not a project');
     }
 });*/
-program.command('register [version]').action(function (newVersion) {
+var register = function (registryURL) {
     if (fs.existsSync(process.cwd() + '/package.json')) {
         var pack = JSON.parse(fs.readFileSync(process.cwd() + '/package.json', 'utf8'));
         var version = pack.version;
         var moduleName = pack.name;
         var author = pack.author;
-        // let displayName = pack.displayName;
         console.log(chalk.cyan('registering ' + author + "'s module, " + moduleName + ' ' + version + ' in the LINCD registry'));
-        //temporary test code
-        return fetch('http://localhost:4001/register', {
+        return fetch(registryURL + '/register', {
             method: 'POST',
             headers: {
                 Accept: 'application/json, text/plain, */*',
@@ -628,113 +919,13 @@ program.command('register [version]').action(function (newVersion) {
                 console.log(chalk.cyan('Response: ') + json.result);
             }
         })["catch"](function (err) {
-            console.warn('Could not connect to LINCD registry');
+            console.warn(chalk.red('Warning: ') + 'Could not connect to LINCD registry');
         });
-        /*console.log(chalk.cyan('building production bundles'));
-        return execPromise('yarn lincd build production', false, true)
-          .then((output: string) => {
-            if (buildFailed(output)) {
-              // console.warn("Build failed:");
-              console.log(output);
-              throw new Error('build failed');
-            }
-            pack.version = newVersion;
-            //save package.json
-            return fs.writeFileSync(
-              path.join(process.cwd(), 'package.json'),
-              JSON.stringify(pack, null, 2),
-            );
-          })
-          .then((version) => {
-            console.log(chalk.cyan('Committing to git'));
-            //we have just changed package.json, so there will be things "uncommitted"
-            //to make sure this module does not automatically come up as "needing to be published" we need to commit this change here straight away
-            //so: add all files not added yet in the folder of this module
-            //then commit all changes (including new version number in package.json)
-            //then add a version commit git flag
-            return execPromise(
-              `git add -- ./ & git commit -m "publishing ${moduleName} ${newVersion}" -- ./ & git tag ${moduleName}@${newVersion}"`,
-            );
-          })
-          .then((version) => {
-            console.log(chalk.cyan('Publishing ' + moduleName + ' ' + newVersion));
-    
-            // let tag = moduleName+'@'+version;
-            return execPromise('yarn publish --new-version ' + newVersion, true);
-          })
-          .then((res) => {
-            if (
-              res.indexOf('Aborted due to warnings') !== -1 ||
-              res.indexOf('Could not publish') !== -1 ||
-              res.indexOf("Couldn't publish") !== -1
-            ) {
-              console.log(chalk.red('Failed to publish'));
-              return false;
-            } else {
-              var pack = JSON.parse(
-                fs.readFileSync(process.cwd() + '/package.json', 'utf8'),
-              );
-              version = pack.version;
-              console.log(chalk.green('Published ' + version));
-              return true;
-            }
-          })
-          .catch((err) => {
-            console.warn(chalk.red('Could not publish: ' + err));
-          });*/
     }
     else {
-        console.warn('not found: ' + process.cwd() + '/package.json');
-    }
-});
-// program.command('create [action] [value]').action((action, prefixedUri) => {
-//
-// 	let [ontology,label] = typeof prefixedUri !== 'undefined' ? prefixedUri.split(":") : [];
-// 	if(!ontology || !label)
-// 	{
-// 		return console.warn("Please provide a prefixed URI of the "+action+" to create");
-// 	}
-// 	if(action == 'viewtype')
-// 	{
-// 		//add to ontology file
-// 		let contents = fs.readFileSync(path.join('src','ontologies',ontology),'utf8');
-//
-//
-// 		//create view file
-// 		//add view file to index
-// 	}
-// });
-program.command('info').action(function () {
-    var ownPackage = JSON.parse(fs.readFileSync(path.join(__dirname, 'package.json'), 'utf8'));
-    console.log(ownPackage.version);
-    console.log('Running from: ' + __dirname);
-});
-var ensurePath = function () {
-    var folders = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        folders[_i] = arguments[_i];
+        console.warn(chalk.red('Warning:') + ' not found: ' + process.cwd() + '/package.json');
     }
-    // let target = path.join(folders.shift());
-    var target;
-    folders.forEach(function (folder) {
-        target = target ? path.join(target, folder) : path.join(folder);
-        if (!fs.existsSync(target)) {
-            fs.mkdirSync(target);
-        }
-    });
-    return target;
 };
-program.command('test-build').action(function (target, target2) {
-    execPromise('yarn lincd build', true)
-        .then(function (result) {
-        console.log('success');
-    })["catch"](function (err) {
-        console.log('failed');
-    });
-});
-program.command('build [target] [target2]').action(function (target, target2) {
-    buildModule(target, target2);
-});
 var buildModule = function (target, target2, modulePath, logResults) {
     if (modulePath === void 0) { modulePath = process.cwd(); }
     if (logResults === void 0) { logResults = true; }
@@ -776,9 +967,6 @@ var buildModule = function (target, target2, modulePath, logResults) {
         console.warn('unknown build target. Use es5, es6 or production.');
     }
 };
-// program.command('css').action((message) => {
-// 	return execp('grunt babel:css-module-transforms');
-// });
 var getLastBuildTime = function (modulePath) {
     return getLastModifiedFile(modulePath + '/@(builds|lib)/**/*.js');
 };
@@ -808,12 +996,6 @@ var getLastModifiedFile = function (filePath, config) {
             // console.log("skipping directory "+fileName);
             return;
         }
-        //not counting things that are generated during build process when determining last modified source-code time
-        // if(fileName.indexOf(".d.ts") !== -1 || fileName.indexOf(".css.json") !== -1)
-        // {
-        // 	// console.log("not counting "+fileName);
-        // 	return;
-        // }
         var mtime = fs.statSync(path.join(fileName)).mtime;
         var modifiedTime = mtime.getTime();
         if (modifiedTime > lastModifiedTime) {
@@ -825,14 +1007,6 @@ var getLastModifiedFile = function (filePath, config) {
     });
     return { lastModified: lastModified, lastModifiedName: lastModifiedName, lastModifiedTime: lastModifiedTime };
 };
-program.command('publish-updated').action(function () {
-    return publishUpdated();
-});
-program.command('status').action(function () {
-    return publishUpdated(true).then(function () {
-        return buildUpdated(undefined, '', '', true);
-    });
-});
 var publishUpdated = function (test) {
     var _this = this;
     if (test === void 0) { test = false; }
@@ -936,12 +1110,6 @@ var executeSingleBuild = function (module, previousResult, test, info) {
         return previousResult + ' ' + chalk.blue(module.moduleName + ' should publish\n');
     }
 };
-program.command('build-updated [target] [target2]').action(function (target, target2) {
-    return buildUpdated(1, target, target2);
-});
-program.command('build-updated-since [num-commits-back] [target] [target2]').action(function (back, target, target2) {
-    return buildUpdated(back, target, target2);
-});
 var buildUpdated = function (back, target, target2, test) {
     if (test === void 0) { test = false; }
     // back = back || 1;
@@ -1005,214 +1173,6 @@ 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');
 };
-program.command('build-all [target] [target2]').action(function (target, target2) {
-    var dependencies = new Map();
-    console.log('Building all modules of this repository in order of dependencies');
-    var modules = getLocalLincdModuleMap();
-    //get dependencies of each module
-    var leastDependentModule;
-    modules.forEach(function (module) {
-        var pack = (0, utils_1.getPackageJSON)(module.path);
-        if (pack) {
-            //get lincd related dependencies and get the actual module details from the module map by removing '@dacore/' from the package name
-            var moduleDependencies = Object.keys(pack.dependencies)
-                .filter(function (dependency) { return modules.has(dependency); })
-                .map(function (dependency) {
-                return modules.has(dependency) ? modules.get(dependency) : dependency;
-            });
-            // console.log(module.moduleName,moduleDependencies.map())
-            dependencies.set(module, moduleDependencies);
-        }
-    });
-    dependencies.forEach(function (moduleDependencies, module) {
-        if (!moduleDependencies.some(function (dependency) {
-            return typeof dependency !== 'string' && modules.has(dependency.moduleName);
-        })) {
-            leastDependentModule = module;
-        }
-    });
-    var startFrom;
-    //by default start building
-    var building = true;
-    //option to start from a specific module in the stack
-    if (target == 'from') {
-        startFrom = target2;
-        //if we have a startFrom, then we havnt started the build process yet
-        building = startFrom ? false : true;
-        //clear targets
-        target = '';
-        target2 = '';
-        console.log(chalk.blue('Will skip builds until ' + startFrom));
-    }
-    var stack = [leastDependentModule];
-    var done = new Set();
-    var p = Promise.resolve();
-    var runStack = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var modulesLeft, failedModules, stackPromise, first_1;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    modulesLeft = modules.size - done.size;
-                    if (done.size > 0) {
-                        console.log(chalk.magenta('\n-------\nThese modules are next, since all their dependencies have now been build:'));
-                        console.log(chalk.magenta(stack.map(function (i) { return i.moduleName; })));
-                        // log(stack);
-                    }
-                    failedModules = [];
-                    stackPromise = Promise.all(stack.map(function (module) {
-                        // p = p.then(() => {
-                        var command;
-                        //if we're skipping builds until a certain module
-                        if (!building) {
-                            //if the module name matches the module we're supposed to start from then start building modules
-                            if (module.moduleName == startFrom || module.packageName == startFrom) {
-                                building = true;
-                            }
-                            //else still waiting for the module
-                            else {
-                                log(chalk.blue('skipping ' + module.moduleName));
-                                command = Promise.resolve(true);
-                            }
-                        }
-                        //unless told otherwise, build the module
-                        if (!command) {
-                            command = execp('cd ' +
-                                module.path +
-                                ' && yarn lincd build' +
-                                (target ? ' ' + target : '') +
-                                (target2 ? ' ' + target2 : ''));
-                            log(chalk.cyan('Building ' + module.moduleName));
-                        }
-                        return command["catch"](function (err) {
-                            var dependentModules = [];
-                            dependencies.forEach(function (dModuleDependencies, dModule) {
-                                if (dModuleDependencies.indexOf(module) !== -1) {
-                                    dependentModules.push(dModule);
-                                }
-                            });
-                            if (dependentModules.length > 0) {
-                                failedModules.push(module.moduleName);
-                                printFailedModules(failedModules);
-                                console.log(chalk.magenta('Stopping build process because an error occurred whilst building ' +
-                                    module.moduleName +
-                                    ', which ' +
-                                    dependentModules.length +
-                                    ' other modules depend on.')); //"+dependentModules.map(d => d.moduleName).join(", ")));
-                                console.log(chalk.cyanBright('tip ') +
-                                    'Run ' +
-                                    chalk.green("lincd build-all from ".concat(module.moduleName)) +
-                                    ' to build only the remaining modules'); //"+dependentModules.map(d => d.moduleName).join(", ")));
-                                process.exit(1);
-                            }
-                            else {
-                                failedModules.push(module.moduleName);
-                            }
-                        })
-                            .then(function (res) {
-                            done.add(module);
-                            modulesLeft--;
-                            log(chalk.magenta(modulesLeft + ' modules left'));
-                            if (modulesLeft == 0 && failedModules.length > 0) {
-                                printFailedModules(failedModules);
-                            }
-                            return res;
-                        });
-                        // });
-                        // done.add(module);
-                    }));
-                    //wait till stack is completed
-                    return [4 /*yield*/, stackPromise];
-                case 1:
-                    //wait till stack is completed
-                    _a.sent();
-                    // await p;
-                    //clear stack for next round
-                    stack = [];
-                    //find those modules who have all their dependencies already built and add them to the stack
-                    modules.forEach(function (module) {
-                        var deps = dependencies.get(module);
-                        //if the module is not done yet
-                        //but every dependency is now done OR was not something we can build (some @dacore dependencies may not be local)
-                        if (!done.has(module) &&
-                            deps.every(function (dependency) {
-                                return typeof dependency !== 'string' && (done.has(dependency) || !modules.has(dependency.moduleName));
-                            })) {
-                            stack.push(module);
-                        }
-                        // else if(!done.has(module))
-                        // {
-                        // 	console.log(chalk.red(module+' not yet'))
-                        // 	console.log('UNMET DEPS: '+deps.filter(dependency => !done.has(dependency)).join(" "))
-                        // }
-                    });
-                    //if more to be built, iterate
-                    if (stack.length > 0) {
-                        return [2 /*return*/, runStack()];
-                    }
-                    else {
-                        //if no more modules to build but we never started building...
-                        if (!building) {
-                            console.log(chalk.red('Could not find the module to start from. Please provide a correct package name or module name to build from'));
-                        }
-                        else {
-                            first_1 = true;
-                            modules.forEach(function (module) {
-                                if (!done.has(module)) {
-                                    var deps = dependencies.get(module);
-                                    if (first_1) {
-                                        console.log(chalk.red('CYCLICAL DEPENDENCIES? - could not build some modules because they depend on each other.'));
-                                        first_1 = false;
-                                    }
-                                    //print the cyclical dependencies
-                                    console.log(chalk.red(module.moduleName) +
-                                        ' depends on ' +
-                                        deps
-                                            .filter(function (dependency) {
-                                            return typeof dependency !== 'string';
-                                        })
-                                            .map(function (d) {
-                                            return done.has(d) ? d.moduleName : chalk.red(d.moduleName);
-                                        })
-                                            .join(', '));
-                                    //also print some information why these modules have not been moved into the stack
-                                    var stringDependencies = deps.filter(function (d) { return typeof d === 'string'; });
-                                    if (stringDependencies.length > 0) {
-                                        console.log(chalk.red('And it depends on these module(s) - which seem not to be proper modules :' +
-                                            stringDependencies.join(', ')));
-                                        console.log(chalk.red('Could you remove this from dependencies? Should it be a devDependency?'));
-                                    }
-                                }
-                            });
-                        }
-                    }
-                    return [2 /*return*/];
-            }
-        });
-    }); };
-    //starts the process
-    runStack();
-});
-program.command('modules [action] [includedSpaces]').action(function (command, includedSpaces) {
-    executeCommandForEachModule(getLincdModules(), command, includedSpaces);
-});
-program.command('modules-except [excludedSpaces] [action]').action(function (excludedSpaces, command) {
-    executeCommandForEachModule(getLincdModules(), command, null, excludedSpaces);
-});
-program
-    .command('module|mod [module] [a1] [a2] [a3] [a4]')
-    .action(function (module) {
-    var args = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        args[_i - 1] = arguments[_i];
-    }
-    var command = args
-        .slice(0, 3)
-        .filter(function (a) { return a && true; })
-        .join(' ');
-    executeCommandForModule(module, command);
-})
-    .alias('mod')
-    .alias('m');
 var executeCommandForEachModule = function (modules, command, includedSpaces, excludedSpaces) {
     //if a specific set of modules is given
     if (includedSpaces) {
@@ -1238,88 +1198,16 @@ var executeCommandForEachModule = function (modules, command, includedSpaces, ex
     });
     return p;
 };
-var executeCommandForModule = function (module, command) {
+var executeCommandForModule = function (moduleName, command) {
     var moduleDetails = getLincdModules().find(function (modDetails) {
-        return modDetails.packageName.indexOf(module) !== -1 || modDetails.moduleName.indexOf(module) !== -1;
+        return modDetails.packageName.indexOf(moduleName) !== -1 || modDetails.moduleName.indexOf(moduleName) !== -1;
     });
     if (moduleDetails) {
-        log("Executing 'cd " + moduleDetails.path + ' && lincd ' + command + "'");
-        return execp('cd ' + moduleDetails.path + ' && lincd ' + command);
-    }
-};
-program.command('dev [target] [mode]').action(function (target, mode) {
-    if (!target)
-        target = 'es6';
-    if (mode !== 'production')
-        mode = '';
-    else if (target !== 'es6')
-        log('target must be es6 when developing for production');
-    if (target == 'es5' || target == 'es6') {
-        // log('> Starting continuous development build for '+target+' target')
-        log('starting continuous development build');
-        log('grunt dev' + (target ? '-' + target : '') + (mode ? '-' + mode : '') + ' --color');
-        var command = exec('grunt dev' + (target ? '-' + target : '') + (mode ? '-' + mode : '') + ' --color');
-        command.stdout.pipe(process.stdout);
-        command.stderr.pipe(process.stderr);
+        log("Executing 'cd " + moduleDetails.path + ' && yarn lincd' + (command ? ' ' + command : '') + "'");
+        return execp('cd ' + moduleDetails.path + ' && yarn lincd' + (command ? ' ' + command : ''));
     }
     else {
-        console.warn('unknown build target. Use es5 or es6');
+        warn("Could not find a module who\'s name (partially) matched " + chalk.cyan(moduleName));
     }
-});
-program.command('help').action(function (command) {
-    logHelp();
-});
-program.command('*').action(function (command) {
-    console.warn(chalk.red('unknown command: ' + command.args.join(' ')));
-    logHelp();
-});
-function logHelp() {
-    var ownPackage = JSON.parse(fs.readFileSync(path.join(__dirname, '../package.json'), 'utf8'));
-    console.log('lincd-cli ' + ownPackage.version);
-    console.log(chalk.green('\nAvailable commands from a module:'));
-    console.log(chalk.blue('- build [es5|es6|production] [es5|es6] ') +
-        chalk.cyan('- creates bundles & compiles source files each target environment'));
-    console.log(chalk.blue('- dev [es5|es6] [production] ') +
-        chalk.cyan('- continuously build bundles & compile source on file changes'));
-    // console.log(
-    // 	chalk.blue('- init [name] [uribase] ') +
-    // 		chalk.cyan(
-    // 			'- sets up a new module, sets up initial files and installs dependencies',
-    // 		),
-    // );
-    console.log(chalk.blue('- publish [version|minor|major|patch] ') +
-        chalk.cyan('- publish new version to the npm registry AND to the LINCD.org registry'));
-    //TODO: these all need to be tested to see if they work with the new LINCD setup
-    console.log(chalk.green('\nAvailable commands from a yarn workspace:'));
-    console.log(chalk.blue('- modules|mod|m module-name ...command') +
-        chalk.cyan('- execute a lincd command for a specific module in this workspace. Use can use partial packageNames. So `lincd m xsd build` will trigger `lincd build` for the module lincd-xsd'));
-    console.log(chalk.blue('- build-all [from] [module-name]') +
-        chalk.cyan('- build all modules in order of dependencies. To continue later from a specific module, add `from {modulename}`'));
-    console.log(chalk.blue('- build-updated') +
-        chalk.cyan('- build only those modules that have updated their source since their last local built'));
-    /*
-    console.log(
-      chalk.blue('- build-updated [n] ') +
-        chalk.cyan(
-          '- build only those modules that have updated their source since the last local commit (or optionally n commits back',
-        ),
-    );
-    console.log(
-      chalk.blue('- modules [action]') +
-      chalk.cyan('- execute a command for all modules'),
-    );
-    console.log(
-      chalk.blue('- publish-updated [message] ') +
-        chalk.cyan(
-          "- publish all modules who's source changes have been committed to git since the last published version.",
-        ),
-    );
-    console.log(
-      chalk.blue('- status') +
-      chalk.cyan('- see which modules need to be published or build'),
-    );*/
-    console.log(chalk.green('\nOther commands:'));
-    console.log(chalk.blue('- info ') + chalk.cyan('- print the version of this tool and where it runs from'));
-    console.log(chalk.blue('- help ') + chalk.cyan('- print this message'));
-}
+};
 program.parse(process.argv);

package/lib/utils.js

@@ -33,15 +33,18 @@ var SHACL_1 = require("lincd/lib/shapes/SHACL");
 var CoreSet_1 = require("lincd/lib/collections/CoreSet");
 var JSONLDWriter_1 = require("lincd-jsonld/lib/JSONLDWriter");
 var chalk_1 = __importDefault(require("chalk"));
-var getPackageJSON = function (root) {
+var getPackageJSON = function (root, error) {
     if (root === void 0) { root = process.cwd(); }
+    if (error === void 0) { error = true; }
     var packagePath = path.join(root, 'package.json');
     if (fs.existsSync(packagePath)) {
         return JSON.parse(fs.readFileSync(packagePath, 'utf8'));
     }
     else if (root === process.cwd()) {
-        console.warn('Could not find package.json. Make sure you run this command from the root of a lincd module or a lincd yarn workspace');
-        process.exit();
+        if (error) {
+            console.warn('Could not find package.json. Make sure you run this command from the root of a lincd module or a lincd yarn workspace');
+            process.exit();
+        }
     }
 };
 exports.getPackageJSON = getPackageJSON;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lincd-cli",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "Command line tools for the lincd.js library",
   "main": "lib/index.js",
   "scripts": {
@@ -31,7 +31,7 @@
     "chalk": "4.1.0",
     "child-process-promise": "^2.2.1",
     "colors": "^1.4.0",
-    "commander": "^6.2.0",
+    "commander": "^9.4.0",
     "css-loader": "^5.2.7",
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
     "fs-extra": "^10.1.0",