lincd-cli 0.1.7 → 0.1.10

package/lib/config-webpack.js

@@ -44,7 +44,8 @@ function generateWebpackConfig(buildName, moduleName, config) {
     var productionMode = nodeProduction || config.productionMode;
     var es5 = config.target == 'es5';
     var es6 = config.target == 'es6';
-    var cleanModuleName = moduleName.replace(/@\w+\//, '');
+    //remove the scope (used for filenames for example)
+    var cleanModuleName = moduleName.replace(/@[\w\-]+\//, '');
     var configFile;
     if (es5 && fs.existsSync('tsconfig-es5.json')) {
         configFile = 'tsconfig-es5.json';
@@ -209,7 +210,7 @@ function generateWebpackConfig(buildName, moduleName, config) {
         }));
     }
     return {
-        entry: config.entry ? config.entry : (tsConfig.files ? tsConfig.files : './src/index.ts'),
+        entry: config.entry ? config.entry : tsConfig.files ? tsConfig.files : './src/index.ts',
         output: {
             filename: (config.filename ? config.filename : cleanModuleName) + (es5 ? '.es5' : '') + '.js',
             path: path.resolve(process.cwd(), config.bundlePath || 'dist'),

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.7",
+  "version": "0.1.10",
   "description": "Command line tools for the lincd.js library",
   "main": "lib/index.js",
   "scripts": {
@@ -14,6 +14,7 @@
     "build",
     "tools"
   ],
+  "repository": "https://github.com:Semantu/lincd.org",
   "author": {
     "name": "René Verheij",
     "email": "rpwverheij@gmail.com"
@@ -25,12 +26,12 @@
   "dependencies": {
     "@lodder/grunt-postcss": "^3.1.1",
     "@types/node": "^17.0.14",
-    "@types/react": "^18.0.15",
+    "@types/react": "^18.0.17",
     "@types/react-dom": "^18.0.6",
     "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",
@@ -40,7 +41,7 @@
     "grunt-contrib-clean": "^2.0.0",
     "grunt-contrib-copy": "^1.0.0",
     "grunt-exec": "^3.0.0",
-    "grunt-ts": "^6.0.0-beta.17",
+    "grunt-ts": "^6.0.0-beta.22",
     "grunt-webpack": "^4.0.2",
     "license-info-webpack-plugin": "^3.0.0",
     "lincd": "^0.2",
@@ -54,7 +55,6 @@
     "postcss-modules": "^4.3.1",
     "postcss-nested": "^5.0.6",
     "postcss-scss": "^4.0.4",
-    "postcss-strip-inline-comments": "^0.1.5",
     "require-extensions": "^0.0.4",
     "sass": "^1.51.0",
     "sass-loader": "^10.0",
@@ -62,16 +62,16 @@
     "tailwindcss": "^3.1.6",
     "terser-webpack-plugin": "^4.0.0",
     "ts-loader": "8.2.0",
-    "ts-node": "^10.7.0",
+    "ts-node": "10.7",
     "tsc-hooks": "^1.1.1",
     "tsconfig-paths-webpack-plugin": "^3.3.0",
-    "typescript": "^4.6",
+    "typescript": "4.6.4",
     "webpack": "^4.0.0",
-    "webpack-bundle-analyzer": "^3.0.0",
+    "webpack-bundle-analyzer": "^4.6.1",
     "webpack-license-plugin": "^4.2.1"
   },
   "devDependencies": {
     "optimize-css-assets-webpack-plugin": "^6.0.1"
   },
   "peerDepencencies": {}
-}
+}

package/utils.js

@@ -0,0 +1,39 @@
+"use strict";
+exports.__esModule = true;
+exports.getShapes = exports.getShapesJSONLD = exports.getPackageJSON = void 0;
+var fs = require("fs");
+var path = require("path");
+var SHACL_Shape_1 = require("lincd/lib/shapes/SHACL_Shape");
+var CoreSet_1 = require("lincd/lib/collections/CoreSet");
+var JSONLDWriter_1 = require("lincd-jsonld/lib/JSONLDWriter");
+var getPackageJSON = function (root) {
+    if (root === void 0) { root = process.cwd(); }
+    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();
+    }
+};
+exports.getPackageJSON = getPackageJSON;
+function getShapesJSONLD(moduleExports) {
+    return JSONLDWriter_1.JSONLDWriter.stringify(getShapes(moduleExports));
+}
+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_Shape_1.SHACL_Shape) {
+                shapes.add(moduleExport.shape);
+            }
+        }
+    }
+    return shapes;
+}
+exports.getShapes = getShapes;

package/defaults/create_migration.js

@@ -1,155 +0,0 @@
-'use strict';
-var __awaiter =
-	(this && this.__awaiter) ||
-	function (thisArg, _arguments, P, generator) {
-		function adopt(value) {
-			return value instanceof P
-				? value
-				: new P(function (resolve) {
-						resolve(value);
-				  });
-		}
-		return new (P || (P = Promise))(function (resolve, reject) {
-			function fulfilled(value) {
-				try {
-					step(generator.next(value));
-				} catch (e) {
-					reject(e);
-				}
-			}
-			function rejected(value) {
-				try {
-					step(generator['throw'](value));
-				} catch (e) {
-					reject(e);
-				}
-			}
-			function step(result) {
-				result.done
-					? resolve(result.value)
-					: adopt(result.value).then(fulfilled, rejected);
-			}
-			step((generator = generator.apply(thisArg, _arguments || [])).next());
-		});
-	};
-var __generator =
-	(this && this.__generator) ||
-	function (thisArg, body) {
-		var _ = {
-				label: 0,
-				sent: function () {
-					if (t[0] & 1) throw t[1];
-					return t[1];
-				},
-				trys: [],
-				ops: [],
-			},
-			f,
-			y,
-			t,
-			g;
-		return (
-			(g = {next: verb(0), throw: verb(1), return: verb(2)}),
-			typeof Symbol === 'function' &&
-				(g[Symbol.iterator] = function () {
-					return this;
-				}),
-			g
-		);
-		function verb(n) {
-			return function (v) {
-				return step([n, v]);
-			};
-		}
-		function step(op) {
-			if (f) throw new TypeError('Generator is already executing.');
-			while (_)
-				try {
-					if (
-						((f = 1),
-						y &&
-							(t =
-								op[0] & 2
-									? y['return']
-									: op[0]
-									? y['throw'] || ((t = y['return']) && t.call(y), 0)
-									: y.next) &&
-							!(t = t.call(y, op[1])).done)
-					)
-						return t;
-					if (((y = 0), t)) op = [op[0] & 2, t.value];
-					switch (op[0]) {
-						case 0:
-						case 1:
-							t = op;
-							break;
-						case 4:
-							_.label++;
-							return {value: op[1], done: false};
-						case 5:
-							_.label++;
-							y = op[1];
-							op = [0];
-							continue;
-						case 7:
-							op = _.ops.pop();
-							_.trys.pop();
-							continue;
-						default:
-							if (
-								!((t = _.trys), (t = t.length > 0 && t[t.length - 1])) &&
-								(op[0] === 6 || op[0] === 2)
-							) {
-								_ = 0;
-								continue;
-							}
-							if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) {
-								_.label = op[1];
-								break;
-							}
-							if (op[0] === 6 && _.label < t[1]) {
-								_.label = t[1];
-								t = op;
-								break;
-							}
-							if (t && _.label < t[2]) {
-								_.label = t[2];
-								_.ops.push(op);
-								break;
-							}
-							if (t[2]) _.ops.pop();
-							_.trys.pop();
-							continue;
-					}
-					op = body.call(thisArg, _);
-				} catch (e) {
-					op = [6, e];
-					y = 0;
-				} finally {
-					f = t = 0;
-				}
-			if (op[0] & 5) throw op[1];
-			return {value: op[0] ? op[1] : void 0, done: true};
-		}
-	};
-exports.__esModule = true;
-var $name = /** @class */ (function () {
-	function $name() {}
-	$name.apply = function () {
-		return __awaiter(this, void 0, void 0, function () {
-			return __generator(this, function (_a) {
-				return [2 /*return*/];
-			});
-		});
-	};
-	$name.undo = function () {
-		return __awaiter(this, void 0, void 0, function () {
-			return __generator(this, function (_a) {
-				return [2 /*return*/];
-			});
-		});
-	};
-	$name.migration_name = '$shortName';
-	return $name;
-})();
-exports['default'] = $name;

package/defaults/create_migration.ts

@@ -1,7 +0,0 @@
-export default class $name {
-  static migration_name: string = '$shortName';
-
-  static async apply() {}
-
-  static async undo() {}
-}

package/defaults/defaultModule/Index.js

@@ -1,30 +0,0 @@
-'use strict';
-exports.__esModule = true;
-exports.$ = void 0;
-var Core_1 = require('@dacore/core/lib/types/Core');
-var UriResource_1 = require('@dacore/core/lib/models/UriResource');
-var JSONLD_1 = require('@dacore/core/lib/utils/JSONLD');
-var $ = require();
-exports.$ = $;
-from;
-('./ontologies/${ontology_name}');
-var Index = require('./views/Index');
-var _dataPromise = JSONLD_1.JSONLD.parse(
-	require('../data/data.json'),
-	true,
-	true,
-);
-var moduleResource = UriResource_1.UriResource.getOrCreate(
-	'${uri_base}/module/${module_name}',
-);
-Core_1.Core.app().registerModule(
-	'${module_name}',
-	this,
-	moduleResource,
-	_dataPromise,
-	[$, {underscore_ontology_name: underscore_ontology_name}._parsePromise],
-);
-{
-	underscore_ontology_name;
-}
-Index;

package/defaults/defaultModule/Index.scss

@@ -1,19 +0,0 @@
-.Index {
-  width: 80%;
-  max-width: 44rem;
-  padding: 7rem 4rem 3rem;
-  margin: 58px auto !important;
-  box-shadow: 0px 0px 36px #50625055;
-  border-radius: 10px;
-  font-family: monospace;
-  font-size: 15px;
-  background: url(https://www.dacore.org/img/logo@2x.png) top right no-repeat;
-  background-size: 240px;
-  background-position-y: 26px;
-  background-position-x: center;
-
-  code {
-    padding: 2px 4px;
-    background-color: #eee;
-  }
-}

package/defaults/defaultModule/Index.tsx

@@ -1,32 +0,0 @@
-import { React,ReactComponent } from "@dacore/core/lib/shapes/ReactComponent";
-import { UriResource } from "@dacore/core/lib/models";
-import "./Index.scss";
-import style from "./Index.scss.json";
-import ${projectName} from "../ontologies/${projectName}";
-
-export default class Index extends ReactComponent<any,any>
-{
-  static viewType: UriResource = ${projectName}
-.
-  Index;
-
-  render()
-  {
-    return <div className={style.Index}>
-      <hr />
-      <p>Welcome to your new LINCD setup!</p>
-      <p>
-        To start coding:
-        <ul>
-          <li>Go to <code>/modules/${browserTitle}</code> and run <code>yarn lincd dev</code> to start developing your
-            module
-          </li>
-          <li>Open <code>modules/${browserTitle}/src/views/Index.tsx</code> to edit this page.</li>
-          <li>For pages rendered on the initial page request you currently have to restart the server and refresh the
-            page to see the results (for others you can simply refresh)
-          </li>
-        </ul>
-      </p>
-    </div>;
-  }
-}

package/defaults/defaultModule/data.json

@@ -1,56 +0,0 @@
-{
-  "@context": {
-    "rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
-    "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
-    "module": "http://data.dacore.org/ontologies/module/",
-    "core": "http://data.dacore.org/ontologies/core/",
-    "oc": "http://data.dacore.org/ontologies/oc/",
-    "xsd": "http://www.w3.org/2001/XMLSchema#",
-    "router": "http://data.dacore.org/ontologies/router/",
-    "node-core": "http://data.dacore.org/ontologies/node-core/",
-    "mysite": "http://data.mysite.com/ontology/mysite/",
-    "admin": "http://data.dacore.org/ontologies/admin/",
-    "html": "http://data.dacore.org/ontologies/html/"
-  },
-  "@graph": [
-    {
-      "@id": "${defaultModuleUri}",
-      "@type": "module:Module",
-      "module:maintainsOntology": {
-        "@id": "${defaultOntologyUri}"
-      },
-      "module:npmPath": "@dacore/${projectName}",
-      "rdfs:label": "${projectName}"
-    },
-    {
-      "@id": "${uriBase}/moduledatastore/${projectName}",
-      "@type": "node-core:ModuleDataStore",
-      "module:module": {
-        "@id": "${defaultModuleUri}"
-      }
-    },
-    {
-      "@id": "${uriBase}/route//",
-      "@type": "router:Route",
-      "core:viewType": {
-        "@id": "${defaultOntologyUri}Index"
-      },
-      "router:exact": {
-        "@type": "xsd:boolean",
-        "@value": "true"
-      },
-      "router:path": "/"
-    },
-    {
-      "@id": "${uriBase}/route//console",
-      "@type": "router:Route",
-      "core:viewType": {
-        "@id": "admin:AdminOverview"
-      },
-      "router:layout": {
-        "@id": "admin:AdminOverview"
-      },
-      "router:path": "/console"
-    }
-  ]
-}

package/defaults/defaultModule/defaultOntology.json

@@ -1,23 +0,0 @@
-{
-  "@context": {
-    "rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
-    "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
-    "core": "http://data.dacore.org/ontologies/core/",
-    "${projectName}": "${defaultOntologyUri}"
-  },
-  "@graph": [
-    {
-      "@id": "${defaultOntologyUri}",
-      "@type": "http://www.w3.org/2002/07/owl#Ontology",
-      "core:suggestedPrefix": "${projectName}"
-    },
-    {
-      "@id": "${projectName}:Index",
-      "@type": "core:ViewType",
-      "rdfs:isDefinedBy": {
-        "@id": "${defaultOntologyUri}"
-      },
-      "rdfs:label": "Index"
-    }
-  ]
-}

package/defaults/defaultModule/index.ts

@@ -1,16 +0,0 @@
-import { Core } from "@dacore/core/lib/shapes/Core";
-import { UriResource } from "@dacore/core/lib/models";
-import { JSONLD } from "@dacore/core/lib/utils/JSONLD";
-import * as Index from "./views/Index";
-import * as ${underscore_ontology_name} from
-
-"./ontologies/${ontology_name}";
-
-declare var require: any;
-var _dataPromise = JSONLD.parse(require("../data/data.json"),true,true) as Promise<any>;
-
-var moduleResource: UriResource = UriResource.getOrCreate("${uri_base}/module/${module_name}");
-Core.app().registerModule("${module_name}",this,moduleResource,_dataPromise,[${underscore_ontology_name}._parsePromise
-])
-;
-export {${underscore_ontology_name},Index };

package/defaults/defaultModule/ontology.js

@@ -1,21 +0,0 @@
-'use strict';
-exports.__esModule = true;
-exports.Index = exports._parsePromise = exports._ontologyResource = void 0;
-var UriResource_1 = require('@dacore/core/lib/models/UriResource');
-var JSONLD_1 = require('@dacore/core/lib/utils/JSONLD');
-var base = '${uri_base}/ontology/${ontology_name}/';
-exports._ontologyResource = UriResource_1.UriResource.getOrCreate(base);
-var json = require('../../data/ontologies/${ontology_name}.json');
-exports._parsePromise = [
-	exports._ontologyResource,
-	JSONLD_1.JSONLD.parse(json, true, true),
-];
-//add your ontology resources here
-exports.Index = UriResource_1.UriResource.getOrCreate(base + 'Index');
-//make sure every resource is also exported here
-var $,
-	camel_ontology_name = {Index: exports.Index}.camel_ontology_name;
-exports['default'] = $;
-{
-	camel_ontology_name;
-}

package/defaults/defaultModule/ontology.ts

@@ -1,19 +0,0 @@
-import { UriResource } from "@dacore/core/lib/models";
-import { JSONLD } from "@dacore/core/lib/utils/JSONLD";
-
-declare var require: any;
-
-var base: string = "${uri_base}/ontology/${ontology_name}/";
-export var _ontologyResource: UriResource = UriResource.getOrCreate(base);
-
-var json = require("../../data/ontologies/${ontology_name}.json");
-export var _parsePromise: [UriResource,Promise<any>] = [_ontologyResource,JSONLD.parse(json,true,true) as Promise<any>];
-
-//add your ontology resources here
-export var Index: UriResource = UriResource.getOrCreate(base + "Index");
-
-//make sure every node is also exported here
-var ${camel_ontology_name} =;
-{Index;}
-;
-export default ${camel_ontology_name};

package/defaults/gitignorefile

@@ -1,4 +0,0 @@
-**/node_modules
-.idea
-lib
-builds

package/defaults/index.ts

@@ -1,17 +0,0 @@
-import { Core } from "@dacore/core/lib/shapes/Core";
-import { UriResource } from "@dacore/core/lib/models";
-import { JSONLD } from "@dacore/core/lib/utils/JSONLD";
-import * as ${underscore_ontology_name} from
-
-"./ontologies/${ontology_name}";
-//import * as viewName from "./views/viewName"
-//import * as typeName from "./shapes/typeName"
-
-declare var require: any;
-var _dataPromise = JSONLD.parse(require("../data/data.json"),true,true) as Promise<any>;
-
-var moduleResource: UriResource = UriResource.getOrCreate("${uri_base}/module/${module_name}");
-Core.app().registerModule("${module_name}",this,moduleResource,_dataPromise,[${underscore_ontology_name}._parsePromise
-])
-;
-export {${underscore_ontology_name} };

package/defaults/ontology.ts

@@ -1,19 +0,0 @@
-import { UriResource } from "@dacore/core/lib/models";
-import { JSONLD } from "@dacore/core/lib/utils/JSONLD";
-
-declare var require: any;
-
-var base: string = "${uri_base}/ontology/${ontology_name}/";
-export var _ontologyResource: UriResource = UriResource.getOrCreate(base);
-
-var json = require("../../data/ontologies/${ontology_name}.json");
-export var _parsePromise: [UriResource,Promise<any>] = [_ontologyResource,JSONLD.parse(json,true,true) as Promise<any>];
-
-//add your ontology resources here
-// export var node:UriResource = UriResource.getOrCreate(base+"node");
-
-//make sure every node is also exported here
-var ${camel_ontology_name} =;
-{}
-;
-export default ${camel_ontology_name};

package/defaults/package.json

@@ -1,28 +0,0 @@
-{
-  "name": "@dacore/",
-  "version": "0.1.0",
-  "description": "",
-  "lincd": true,
-  "main": "lib/index.js",
-  "author": "",
-  "license": "ISC",
-  "scripts": {
-    "build": "npm exec lincd build",
-    "dev": "npm exec lincd dev",
-    "prepare": "npm exec lincd build production",
-    "postpublish": "npm exec lincd publish"
-  },
-  "keywords": [
-    "lincd",
-    "linked data",
-    "interoperable",
-    "semantic web",
-    "web3"
-  ],
-  "dependencies": {
-    "lincd": "^0.2"
-  },
-  "devDependencies": {
-    "lincd-cli": "^0.1"
-  }
-}

package/defaults/providers.ts

@@ -1 +0,0 @@
-//export {default as SomeProvider} from './shapes/SomeProvider';

package/defaults/site/package.json

@@ -1,40 +0,0 @@
-{
-  "private": true,
-  "name": "${packageName}",
-  "version": "0.2.0",
-  "description": "Server for ${browserTitle}",
-  "main": "lib/index.js",
-  "license": "UNLICENSED",
-  "scripts": {
-    "dev": "node ./lib/start-server.js",
-    "production": "set NODE_ENV=production&& node ./lib/start-server.js"
-  },
-  "directories": {
-    "lib": "lib"
-  },
-  "workspaces": [
-    "modules/*"
-  ],
-  "dependencies": {
-    "@dacore/admin": "^0.2",
-    "@dacore/auth": "^0.2",
-    "@dacore/browser-core": "^0.2",
-    "@dacore/core": "1.x",
-    "@dacore/core-editors": "^0.2",
-    "@dacore/coreviews": "^0.2",
-    "@dacore/core-ui": "^0.2",
-    "@dacore/dcterms": "^0.2",
-    "@dacore/forms": "^0.2",
-    "@dacore/html": "^0.2",
-    "@dacore/icons": "^0.2",
-    "@dacore/rdf4j": "^0.2",
-    "@dacore/server-core": "^0.2",
-    "@dacore/website": "^0.2",
-    "@dacore/website-editors": "^0.2",
-    "react": "^18.1",
-    "react-dom": "^18.1"
-  },
-  "devDependencies": {
-    "@dacore/build-tools": "1.x"
-  }
-}