lincd-cli 0.2.59 → 0.2.60

package/defaults/capacitor/scripts/fix-namespace.js

@@ -1,41 +1,41 @@
-fs = require('fs');
-
-let file = 'android/capacitor-cordova-android-plugins/build.gradle';
-
-//check if file exists
-if (!fs.existsSync(file)) {
-  console.log('File does not exist.', file);
-} else {
-  //read contents of "android/capacitor-cordova-android-plugins/build.gradle"
-  let contents = fs.readFileSync(file, 'utf8');
-
-  if (!contents.includes('namespace')) {
-    //insert text on line 19
-    contents = contents.replace(
-      /android \{/,
-      `android {
-    namespace 'capacitor.android.plugins'`,
-    );
-
-    //write back to file
-    fs.writeFileSync(file, contents, 'utf8');
-
-    console.log('Added namespace to ' + file);
-  } else {
-    console.log('Namespace already present in ' + file);
-  }
-}
-
-let file2 = 'ios/App/Pods/Pods.xcodeproj/project.pbxproj';
-if (!fs.existsSync(file2)) {
-  console.log('File does not exist.', file2);
-} else {
-  let contents2 = fs.readFileSync(file2, 'utf8');
-  if (contents2.includes('IPHONEOS_DEPLOYMENT_TARGET = 12.0')) {
-    contents2 = contents2.replace(/IPHONEOS_DEPLOYMENT_TARGET \= 12\.0/g, `IPHONEOS_DEPLOYMENT_TARGET = 13.0`);
-    fs.writeFileSync(file2, contents2, 'utf8');
-    console.log('Fixed IOS target version for codetrix google oauth plugin');
-  } else {
-    console.log("Didn't need to fix IOS target version");
-  }
-}
+fs = require('fs');
+
+let file = 'android/capacitor-cordova-android-plugins/build.gradle';
+
+//check if file exists
+if (!fs.existsSync(file)) {
+  console.log('File does not exist.', file);
+} else {
+  //read contents of "android/capacitor-cordova-android-plugins/build.gradle"
+  let contents = fs.readFileSync(file, 'utf8');
+
+  if (!contents.includes('namespace')) {
+    //insert text on line 19
+    contents = contents.replace(
+      /android \{/,
+      `android {
+    namespace 'capacitor.android.plugins'`,
+    );
+
+    //write back to file
+    fs.writeFileSync(file, contents, 'utf8');
+
+    console.log('Added namespace to ' + file);
+  } else {
+    console.log('Namespace already present in ' + file);
+  }
+}
+
+let file2 = 'ios/App/Pods/Pods.xcodeproj/project.pbxproj';
+if (!fs.existsSync(file2)) {
+  console.log('File does not exist.', file2);
+} else {
+  let contents2 = fs.readFileSync(file2, 'utf8');
+  if (contents2.includes('IPHONEOS_DEPLOYMENT_TARGET = 12.0')) {
+    contents2 = contents2.replace(/IPHONEOS_DEPLOYMENT_TARGET \= 12\.0/g, `IPHONEOS_DEPLOYMENT_TARGET = 13.0`);
+    fs.writeFileSync(file2, contents2, 'utf8');
+    console.log('Fixed IOS target version for codetrix google oauth plugin');
+  } else {
+    console.log("Didn't need to fix IOS target version");
+  }
+}

package/defaults/component.scss

@@ -1,3 +1,3 @@
-.${camel_name} {
-  display:block;
+.${camel_name} {
+  display:block;
 }

package/defaults/component.tsx

@@ -1,12 +1,12 @@
-import React from "react";
-import "./${hyphen_name}.scss";
-import {default as style} from "./${hyphen_name}.scss.json";
-import {registerPackageModule,linkedComponent} from '../package';
-
-//TODO: replace SHAPE with an actual Shape class
-export const ${camel_name} = linkedComponent<SHAPE>(SHAPE,({source}) => {
-  return <div className={style.${camel_name}}></div>;
-});
-
-//register all components in this file
+import React from "react";
+import "./${hyphen_name}.scss";
+import {default as style} from "./${hyphen_name}.scss.json";
+import {registerPackageModule,linkedComponent} from '../package';
+
+//TODO: replace SHAPE with an actual Shape class
+export const ${camel_name} = linkedComponent<SHAPE>(SHAPE,({source}) => {
+  return <div className={style.${camel_name}}></div>;
+});
+
+//register all components in this file
 registerPackageModule(module);

package/defaults/package/package.json

@@ -1,38 +1,38 @@
-{
-  "name": "${package_name}",
-  "description": "",
-  "author": {
-    "name": "",
-    "email": "",
-    "url": ""
-  },
-  "repository": {
-    "type": "git",
-    "url": ""
-  },
-  "version": "0.1.0",
-  "lincd": true,
-  "main": "lib/index.js",
-  "types": "dist/${output_file_name}.d.ts",
-  "license": "ISC",
-  "scripts": {
-    "start": "npm exec lincd dev",
-    "build": "npm exec lincd build",
-    "prepublishOnly": "npm exec lincd build production",
-    "postpublish": "npm exec lincd register"
-  },
-  "keywords": [
-    "lincd",
-    "linked data",
-    "interoperable",
-    "semantic web",
-    "web3"
-  ],
-  "dependencies": {
-    "lincd": "^0.5",
-    "lincd-jsonld": "^0.1"
-  },
-  "devDependencies": {
-    "lincd-cli": "^0.2"
-  }
-}
+{
+  "name": "${package_name}",
+  "description": "",
+  "author": {
+    "name": "",
+    "email": "",
+    "url": ""
+  },
+  "repository": {
+    "type": "git",
+    "url": ""
+  },
+  "version": "0.1.0",
+  "lincd": true,
+  "main": "lib/index.js",
+  "types": "dist/${output_file_name}.d.ts",
+  "license": "ISC",
+  "scripts": {
+    "start": "npm exec lincd dev",
+    "build": "npm exec lincd build",
+    "prepublishOnly": "npm exec lincd build production",
+    "postpublish": "npm exec lincd register"
+  },
+  "keywords": [
+    "lincd",
+    "linked data",
+    "interoperable",
+    "semantic web",
+    "web3"
+  ],
+  "dependencies": {
+    "lincd": "^0.5",
+    "lincd-jsonld": "^0.1"
+  },
+  "devDependencies": {
+    "lincd-cli": "^0.2"
+  }
+}

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

@@ -1,8 +1,8 @@
-import React from "react";
-import {ExampleShapeClass} from "../shapes/ExampleShapeClass";
-import {linkedComponent} from '../package';
-
-export const ExampleComponent = linkedComponent<ExampleShapeClass>(ExampleShapeClass, ({source}) => {
-  //note that typescript knows that 'source' is an instance of the Shape you linked this component to
-  return <div></div>;
-});
+import React from "react";
+import {ExampleShapeClass} from "../shapes/ExampleShapeClass";
+import {linkedComponent} from '../package';
+
+export const ExampleComponent = linkedComponent<ExampleShapeClass>(ExampleShapeClass, ({source}) => {
+  //note that typescript knows that 'source' is an instance of the Shape you linked this component to
+  return <div></div>;
+});

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

@@ -1,20 +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"
-    }
-  ]
-}
+{
+  "@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/package/src/data/example-ontology.json.d.ts

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

package/defaults/package/src/index.ts

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

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

@@ -1,36 +1,36 @@
-import {NamedNode} from 'lincd/lib/models';
-import {JSONLD} from 'lincd-jsonld/lib/utils/JSONLD';
-import {createNameSpace} from 'lincd/lib/utils/NameSpace';
-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}';
-
-/**
- * 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');
+import {NamedNode} from 'lincd/lib/models';
+import {JSONLD} from 'lincd-jsonld/lib/utils/JSONLD';
+import {createNameSpace} from 'lincd/lib/utils/NameSpace';
+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}';
+
+/**
+ * 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/package/src/package.ts

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

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

@@ -1,29 +1,29 @@
-import {Shape} from 'lincd/lib/shapes/Shape';
-import {Literal, NamedNode} from 'lincd/lib/models';
-import {linkedShape} from '../package';
-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));
-  }
-}
+import {Shape} from 'lincd/lib/shapes/Shape';
+import {Literal, NamedNode} from 'lincd/lib/models';
+import {linkedShape} from '../package';
+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/set-component.tsx

@@ -1,16 +1,16 @@
-import React from "react";
-import "./${hyphen_name}.scss";
-import {default as style} from "./${hyphen_name}.scss.json";
-import {registerPackageModule,linkedSetComponent} from '../package';
-
-//TODO: replace SHAPE with an actual Shape class
-export const ${camel_name} = linkedSetComponent<SHAPE>(SHAPE,({sources}) => {
-  return <div className={style.${camel_name}}>
-    {sources.map(source => {
-      return <div key={source.toString()}></div>;
-    })}
-  </div>;
-});
-
-//register all components in this file
+import React from "react";
+import "./${hyphen_name}.scss";
+import {default as style} from "./${hyphen_name}.scss.json";
+import {registerPackageModule,linkedSetComponent} from '../package';
+
+//TODO: replace SHAPE with an actual Shape class
+export const ${camel_name} = linkedSetComponent<SHAPE>(SHAPE,({sources}) => {
+  return <div className={style.${camel_name}}>
+    {sources.map(source => {
+      return <div key={source.toString()}></div>;
+    })}
+  </div>;
+});
+
+//register all components in this file
 registerPackageModule(module);

package/defaults/shape.ts

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

package/expose-grunt.js

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
-// console.log('forwarding to grunt: ', process.argv.slice(2).join(' '));
+// console.log('forwarding to grunt: ', process.argv.slice(2).join(' '));
 require('grunt-cli/bin/grunt');

package/lib/cli-methods.js

@@ -1265,7 +1265,7 @@ var publishPackage = function (pkg, test, info, publishVersion) {
     });
 };
 exports.publishPackage = publishPackage;
-var buildUpdated = function (back, target, target2, test = false) {
+var buildUpdated = function (back, target, target2, useGitForLastModified = false, test = false) {
     return __awaiter(this, void 0, void 0, function* () {
         // back = back || 1;
         // return execPromise(`git log -${back} --format=%ci`).then((result) => {
@@ -1277,8 +1277,8 @@ var buildUpdated = function (back, target, target2, test = false) {
         // let packages = getLocalLincdModules();
         let packages = getLocalLincdPackageMap();
         // console.log(packages);
-        let jsonldPkgUpdated = needsRebuilding(packages.get('lincd-jsonld'));
-        // let cliPkgUpdated = needsRebuilding(packages.get('lincd-cli'));
+        let jsonldPkgUpdated = yield needsRebuilding(packages.get('lincd-jsonld'), useGitForLastModified);
+        // let cliPkgUpdated = await needsRebuilding(packages.get('lincd-cli'), useGitForLastModified);
         //if either cli or jsonldPkg needs to be rebuilt
         // if (jsonldPkgUpdated || cliPkgUpdated) {
         if (jsonldPkgUpdated) {
@@ -1296,7 +1296,7 @@ var buildUpdated = function (back, target, target2, test = false) {
             packagesLeft = packagesLeft - packageGroup.length;
             return (pkg) => __awaiter(this, void 0, void 0, function* () {
                 // debugInfo('# Checking package ' + pkg.packageName);
-                let needRebuild = needsRebuilding(pkg, true);
+                let needRebuild = yield needsRebuilding(pkg, useGitForLastModified, true);
                 if (pkg.packageName === 'lincd-jsonld' && jsonldPkgUpdated) {
                     needRebuild = true;
                 }
@@ -1345,22 +1345,35 @@ var buildUpdated = function (back, target, target2, test = false) {
     });
 };
 exports.buildUpdated = buildUpdated;
-const needsRebuilding = function (pkg, log = false) {
-    let lastModifiedSource = getLastModifiedSourceTime(pkg.path);
-    let lastModifiedBundle = getLastBuildTime(pkg.path);
-    let result = lastModifiedSource.lastModifiedTime > lastModifiedBundle.lastModifiedTime;
-    if (log) {
-        console.log(chalk_1.default.cyan('Last modified source: ' +
-            lastModifiedSource.lastModifiedName +
-            ' on ' +
-            lastModifiedSource.lastModified.toString()));
-        console.log(chalk_1.default.cyan('Last build: ' +
-            (lastModifiedBundle &&
-                typeof lastModifiedBundle.lastModified !== 'undefined'
-                ? lastModifiedBundle.lastModified.toString()
-                : 'never')));
-    }
-    return result;
+const needsRebuilding = function (pkg, useGitForLastModified, log = false) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let lastModifiedSourceDate;
+        let lastModifiedSourceName;
+        if (useGitForLastModified) {
+            const { changes, commitId, date } = yield getLastCommitTime(pkg.path);
+            lastModifiedSourceDate = date;
+            lastModifiedSourceName = commitId;
+        }
+        else {
+            const { lastModified, lastModifiedName, lastModifiedTime } = getLastModifiedSourceTime(pkg.path);
+            lastModifiedSourceName = lastModifiedName;
+            lastModifiedSourceDate = lastModified;
+        }
+        let lastModifiedBundle = getLastBuildTime(pkg.path);
+        let result = lastModifiedSourceDate.getTime() > lastModifiedBundle.lastModifiedTime;
+        if (log) {
+            console.log(chalk_1.default.cyan('Last modified source: ' +
+                lastModifiedSourceName +
+                ' on ' +
+                lastModifiedSourceDate.toString()));
+            console.log(chalk_1.default.cyan('Last build: ' +
+                (lastModifiedBundle &&
+                    typeof lastModifiedBundle.lastModified !== 'undefined'
+                    ? lastModifiedBundle.lastModified.toString()
+                    : 'never')));
+        }
+        return result;
+    });
 };
 const printBuildResults = function (failed, done) {
     log('Successfully built: ' +

package/lib/cli.js

@@ -97,9 +97,11 @@ program.command('status').action(() => {
 });
 program
     .command('build-updated [target] [target2]')
-    .action((target, target2) => {
-    return (0, cli_methods_1.buildUpdated)(1, target, target2);
-});
+    .action((target, target2, options) => {
+    const { useGit } = options;
+    return (0, cli_methods_1.buildUpdated)(1, target, target2, useGit || false);
+})
+    .option('--use-git', 'Use git commit timestamps to check which packages have been updated since the last build');
 program
     .command('build-updated-since [num-commits-back] [target] [target2]')
     .action((back, target, target2) => {

package/lib/config-grunt.js

@@ -269,11 +269,11 @@ function setupGrunt(grunt, moduleName, config) {
             grunt.task.loadTasks(nestedWorkspacePath);
         }
         else {
-            (0, utils_1.warn)(`Could not load grunt task module ${taskName}
-Could not find task at any of these paths:
-${localPath}
-${localPath2}
-${workspacePath}
+            (0, utils_1.warn)(`Could not load grunt task module ${taskName}
+Could not find task at any of these paths:
+${localPath}
+${localPath2}
+${workspacePath}
 ${nestedWorkspacePath}`);
         }
     });

package/lib/plugins/check-imports.js

@@ -54,7 +54,7 @@ function handler(source) {
     if (isRelativeReq &&
         this.resourcePath.indexOf(baseUrl) !== 0 &&
         this.resourcePath.indexOf('node_modules') === -1) {
-        this.emitError(Error(`LINCD Error: You are importing a file from outside the baseUrl ${tsconfig.compilerOptions.baseUrl}. 
+        this.emitError(Error(`LINCD Error: You are importing a file from outside the baseUrl ${tsconfig.compilerOptions.baseUrl}. 
         ${relativePath} is not in ${tsconfig.compilerOptions.baseUrl}.`));
     }
     // if (this.resourcePath.indexOf(path.resolve('./src')) !== 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lincd-cli",
-  "version": "0.2.59",
+  "version": "0.2.60",
   "description": "Command line tools for the lincd.js library",
   "main": "lib/index.js",
   "scripts": {