Ignore existing files when expanding lsd:module: true

Author: rubensworks

lib/parse/PackageMetadataLoader.ts

@@ -1,5 +1,5 @@
 import * as Path from 'path';
-import { ModuleStateBuilder } from 'componentsjs/lib/loading/ModuleStateBuilder';
+import semverMajor = require('semver/functions/major');
 import type { ResolutionContext } from '../resolution/ResolutionContext';
 
 /**
@@ -27,13 +27,19 @@ export class PackageMetadataLoader {
       throw new Error(`Invalid package: Syntax error in ${packageJsonPath}: ${(<Error> error).message}`);
     }
 
-    // Preprocess to expand things like `"lsd:module": true`
-    if (await ModuleStateBuilder.preprocessPackageJson(packageRootDirectory, packageJson)) {
-      // Add default imports paths, which will not be autogenerated, as they do not exist yet
-      const baseUrl = Object.keys(packageJson['lsd:contexts'])[0].replace('components/context.jsonld', '');
+    // Preprocess to expand `"lsd:module": true`
+    if (packageJson['lsd:module'] === true) {
+      packageJson['lsd:module'] = `https://linkedsoftwaredependencies.org/bundles/npm/${packageJson.name}`;
       const basePath = packageJson['lsd:basePath'] || '';
-      packageJson['lsd:importPaths'][`${baseUrl}components/`] = `${basePath}components/`;
-      packageJson['lsd:importPaths'][`${baseUrl}config/`] = `${basePath}config/`;
+      packageJson['lsd:components'] = `${basePath}components/components.jsonld`;
+      const baseIri = `${packageJson['lsd:module']}/^${semverMajor(packageJson.version)}.0.0/`;
+      packageJson['lsd:contexts'] = {
+        [`${baseIri}components/context.jsonld`]: `${basePath}components/context.jsonld`,
+      };
+      packageJson['lsd:importPaths'] = {
+        [`${baseIri}components/`]: `${basePath}components/`,
+        [`${baseIri}config/`]: `${basePath}config/`,
+      };
     }
 
     // Extract required fields from package.json

package.json

@@ -71,11 +71,13 @@
   ],
   "dependencies": {
     "@types/lru-cache": "^5.1.0",
+    "@types/semver": "^7.3.4",
     "@typescript-eslint/typescript-estree": "^4.6.1",
     "comment-parser": "^0.7.6",
     "jsonld-context-parser": "^2.0.2",
     "lru-cache": "^6.0.0",
-    "minimist": "^1.2.5"
+    "minimist": "^1.2.5",
+    "semver": "^7.3.2"
   },
   "devDependencies": {
     "@rubensworks/eslint-config": "^1.0.1",

yarn.lock

@@ -812,6 +812,11 @@
     "@types/glob" "*"
     "@types/node" "*"
 
+"@types/semver@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.4.tgz#43d7168fec6fa0988bb1a513a697b29296721afb"
+  integrity sha512-+nVsLKlcUCeMzD2ufHEYuJ9a2ovstb6Dp52A5VsoKxDXgvE051XgHI/33I1EymwkRGQkwnA0LkhnUzituGs4EQ==
+
 "@types/stack-utils@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"