feat(upgrade-componentsjs): upgrade to latest componentsjs

comake · Jul 20, 2023 · d5b489e · d5b489e
1 parent fa862ba
commit d5b489e
Show file tree

Hide file tree

Showing 39 changed files with 1,517 additions and 1,068 deletions.
diff --git a/.componentsignore b/.componentsignore
@@ -6,5 +6,18 @@
   "TypeOrmRepository",
   "ConfiguredJobOptions",
   "MigrationInterface",
-  "BullQueueSettings"
+  "BullQueueSettings",
+  "Dict",
+  "NodeJS.Dict",
+  "Promise",
+  "Readonly",
+  "RegExp",
+  "Set",
+  "URL",
+  "HttpResponse",
+  "VariableBindings",
+  "Settings",
+  "Server",
+  "EventEmitter",
+  "YargsOptions"
 ]
diff --git a/config/app/initialize/default.json b/config/app/initialize/default.json
@@ -1,10 +1,10 @@
 {
   "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@comake/solid-on-rails/^0.0.0/components/context.jsonld",
   "import": [
-    "files-sor:config/app/initialize/initializers/base-url.json",
-    "files-sor:config/app/initialize/initializers/logger.json",
-    "files-sor:config/app/initialize/initializers/server.json",
-    "files-sor:config/app/initialize/initializers/version.json"
+    "sor:config/app/initialize/initializers/base-url.json",
+    "sor:config/app/initialize/initializers/logger.json",
+    "sor:config/app/initialize/initializers/server.json",
+    "sor:config/app/initialize/initializers/version.json"
   ],
   "@graph": [
     {
@@ -26,12 +26,7 @@
       ],
       "@id": "urn:solid-on-rails:default:ParallelInitializer",
       "@type": "ParallelHandler",
-      "handlers": [
-        {
-          "comment": "This handler is here because having this array empty gives Components.js errors.",
-          "@type": "StaticHandler"
-        }
-      ]
+      "handlers": []
     }
   ]
 }
diff --git a/config/app/initialize/no-server.json b/config/app/initialize/no-server.json
@@ -1,9 +1,9 @@
 {
   "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@comake/solid-on-rails/^0.0.0/components/context.jsonld",
   "import": [
-    "files-sor:config/app/initialize/initializers/base-url.json",
-    "files-sor:config/app/initialize/initializers/logger.json",
-    "files-sor:config/app/initialize/initializers/version.json"
+    "sor:config/app/initialize/initializers/base-url.json",
+    "sor:config/app/initialize/initializers/logger.json",
+    "sor:config/app/initialize/initializers/version.json"
   ],
   "@graph": [
     {
@@ -24,12 +24,7 @@
       ],
       "@id": "urn:solid-on-rails:default:ParallelInitializer",
       "@type": "ParallelHandler",
-      "handlers": [
-        {
-          "comment": "This handler is here because having this array empty gives Components.js errors.",
-          "@type": "StaticHandler"
-        }
-      ]
+      "handlers": []
     }
   ]
 }
diff --git a/config/app/variables/cli/cli.json b/config/app/variables/cli/cli.json
@@ -5,49 +5,77 @@
       "comment": "Extracts CLI arguments into a key/value object. Config and mainModulePath are only defined here so their description is returned.",
       "@id": "urn:solid-on-rails-setup:default:CliExtractor",
       "@type": "YargsCliExtractor",
-      "parameters": {
-        "config": {
-          "alias": "c",
-          "requiresArg": true,
-          "type": "string",
-          "describe": "The configuration for the server."
+      "parameters": [
+        {
+          "@type": "YargsParameter",
+          "name": "config",
+          "options": {
+            "alias": "c",
+            "requiresArg": true,
+            "type": "string",
+            "describe": "The configuration for the server."
+          }
         },
-        "mainModulePath": {
-          "alias": "m",
-          "requiresArg": true,
-          "type": "string",
-          "describe": "Path from where Components.js will start its lookup when initializing configurations."
+        {
+          "@type": "YargsParameter",
+          "name": "mainModulePath",
+          "options": {
+            "alias": "m",
+            "requiresArg": true,
+            "type": "string",
+            "describe": "Path from where Components.js will start its lookup when initializing configurations."
+          }
         },
-        "loggingLevel": {
-          "alias": "l",
-          "requiresArg": true,
-          "type": "string",
-          "describe": "The detail level of logging; useful for debugging problems."
+        {
+          "@type": "YargsParameter",
+          "name": "loggingLevel",
+          "options": {
+            "alias": "l",
+            "requiresArg": true,
+            "type": "string",
+            "describe": "The detail level of logging; useful for debugging problems."
+          }
         },
-        "envVarPrefix": {
-          "alias": "v",
-          "requiresArg": true,
-          "type": "string",
-          "describe": "Only environment variables starting with this prefix will be parsed when initializing configurations."
+        {
+          "@type": "YargsParameter",
+          "name": "envVarPrefix",
+          "options": {
+            "alias": "v",
+            "requiresArg": true,
+            "type": "string",
+            "describe": "Only environment variables starting with this prefix will be parsed when initializing configurations."
+          }
         },
-        "baseUrl": {
-          "alias": "b",
-          "requiresArg": true,
-          "type": "string",
-          "describe": "The public URL of your server."
+        {
+          "@type": "YargsParameter",
+          "name": "baseUrl",
+          "options": {
+            "alias": "b",
+            "requiresArg": true,
+            "type": "string",
+            "describe": "The public URL of your server."
+          }
         },
-        "port": {
-          "alias": "p",
-          "requiresArg": true,
-          "type": "number",
-          "describe": "The TCP port on which the server runs."
+        {
+          "@type": "YargsParameter",
+          "name": "port",
+          "options": {
+            "alias": "p",
+            "requiresArg": true,
+            "type": "number",
+            "describe": "The TCP port on which the server runs."
+          }
         },
-        "showStackTrace": {
-          "alias": "t",
-          "type": "boolean",
-          "describe": "Enables detailed logging on error pages."
+        {
+          "@type": "YargsParameter",
+          "name": "showStackTrace",
+          "options": {
+            "alias": "t",
+            "type": "boolean",
+            "describe": "Enables detailed logging on error pages."
+          }
         }
-      },
+      ],
       "options": {
         "usage": "node ./bin/server.js [args]",
         "loadFromEnv": true

diff --git a/config/app/variables/default.json b/config/app/variables/default.json
@@ -1,8 +1,8 @@
 {
   "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@comake/solid-on-rails/^0.0.0/components/context.jsonld",
   "import": [
-    "files-sor:config/app/variables/cli/cli.json",
-    "files-sor:config/app/variables/resolver/resolver.json"
+    "sor:config/app/variables/cli/cli.json",
+    "sor:config/app/variables/resolver/resolver.json"
   ],
   "@graph": [
     {

diff --git a/config/default.json b/config/default.json
@@ -1,25 +1,25 @@
 {
   "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@comake/solid-on-rails/^0.0.0/components/context.jsonld",
   "import": [
-    "files-sor:config/app/main/default.json",
-    "files-sor:config/app/initialize/default.json",
-    "files-sor:config/app/finalize/default.json",
-    "files-sor:config/app/variables/default.json",
-    "files-sor:config/app/path/default.json",
-    "files-sor:config/http/handler/default.json",
-    "files-sor:config/http/static/default.json",
-    "files-sor:config/http/routes/default.json",
-    "files-sor:config/http/error-handler.json",
-    "files-sor:config/http/response-writer.json",
-    "files-sor:config/http/request-parser.json",
-    "files-sor:config/server/middleware/default.json",
-    "files-sor:config/server/server-factory/default.json",
-    "files-sor:config/storage/key-value/memory.json",
-    "files-sor:config/storage/data-mapper/type-orm.json",
-    "files-sor:config/jobs/scheduler/default.json",
-    "files-sor:config/jobs/bull.json",
-    "files-sor:config/util/variables/default.json",
-    "files-sor:config/util/logging/winston.json"
+    "sor:config/app/main/default.json",
+    "sor:config/app/initialize/default.json",
+    "sor:config/app/finalize/default.json",
+    "sor:config/app/variables/default.json",
+    "sor:config/app/path/default.json",
+    "sor:config/http/handler/default.json",
+    "sor:config/http/static/default.json",
+    "sor:config/http/routes/default.json",
+    "sor:config/http/error-handler.json",
+    "sor:config/http/response-writer.json",
+    "sor:config/http/request-parser.json",
+    "sor:config/server/middleware/default.json",
+    "sor:config/server/server-factory/default.json",
+    "sor:config/storage/key-value/memory.json",
+    "sor:config/storage/data-mapper/type-orm.json",
+    "sor:config/jobs/scheduler/default.json",
+    "sor:config/jobs/bull.json",
+    "sor:config/util/variables/default.json",
+    "sor:config/util/logging/winston.json"
   ],
   "@graph": [
     {

diff --git a/config/example-queue-accessor.json b/config/example-queue-accessor.json
@@ -1,18 +1,18 @@
 {
   "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@comake/solid-on-rails/^0.0.0/components/context.jsonld",
   "import": [
-    "files-sor:config/app/main/default.json",
-    "files-sor:config/app/initialize/no-server.json",
-    "files-sor:config/app/finalize/no-server.json",
-    "files-sor:config/app/variables/default.json",
-    "files-sor:config/app/path/default.json",
+    "sor:config/app/main/default.json",
+    "sor:config/app/initialize/no-server.json",
+    "sor:config/app/finalize/no-server.json",
+    "sor:config/app/variables/default.json",
+    "sor:config/app/path/default.json",
 
-    "files-sor:config/storage/key-value/memory.json",
+    "sor:config/storage/key-value/memory.json",
 
-    "files-sor:config/jobs/bull-no-processing.json",
+    "sor:config/jobs/bull-no-processing.json",
 
-    "files-sor:config/util/variables/default.json",
-    "files-sor:config/util/logging/winston.json"
+    "sor:config/util/variables/default.json",
+    "sor:config/util/logging/winston.json"
   ],
   "@graph": [
     {

diff --git a/config/example-storage-accessor.json b/config/example-storage-accessor.json
@@ -1,17 +1,17 @@
 {
   "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@comake/solid-on-rails/^0.0.0/components/context.jsonld",
   "import": [
-    "files-sor:config/app/main/default.json",
-    "files-sor:config/app/initialize/no-server.json",
-    "files-sor:config/app/finalize/no-server.json",
-    "files-sor:config/app/variables/default.json",
-    "files-sor:config/app/path/default.json",
+    "sor:config/app/main/default.json",
+    "sor:config/app/initialize/no-server.json",
+    "sor:config/app/finalize/no-server.json",
+    "sor:config/app/variables/default.json",
+    "sor:config/app/path/default.json",
 
-    "files-sor:config/storage/key-value/memory.json",
-    "files-sor:config/storage/data-mapper/type-orm.json",
+    "sor:config/storage/key-value/memory.json",
+    "sor:config/storage/data-mapper/type-orm.json",
 
-    "files-sor:config/util/variables/default.json",
-    "files-sor:config/util/logging/winston.json"
+    "sor:config/util/variables/default.json",
+    "sor:config/util/logging/winston.json"
   ],
   "@graph": [
     {

diff --git a/config/example-task-accessor.json b/config/example-task-accessor.json
@@ -1,19 +1,19 @@
 {
   "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@comake/solid-on-rails/^0.0.0/components/context.jsonld",
   "import": [
-    "files-sor:config/app/main/default.json",
-    "files-sor:config/app/initialize/no-server.json",
-    "files-sor:config/app/finalize/no-server.json",
-    "files-sor:config/app/variables/default.json",
-    "files-sor:config/app/path/default.json",
+    "sor:config/app/main/default.json",
+    "sor:config/app/initialize/no-server.json",
+    "sor:config/app/finalize/no-server.json",
+    "sor:config/app/variables/default.json",
+    "sor:config/app/path/default.json",
 
-    "files-sor:config/storage/key-value/memory.json",
-    "files-sor:config/storage/data-mapper/type-orm.json",
+    "sor:config/storage/key-value/memory.json",
+    "sor:config/storage/data-mapper/type-orm.json",
 
-    "files-sor:config/jobs/bull-no-processing.json",
+    "sor:config/jobs/bull-no-processing.json",
 
-    "files-sor:config/util/variables/default.json",
-    "files-sor:config/util/logging/winston.json"
+    "sor:config/util/variables/default.json",
+    "sor:config/util/logging/winston.json"
   ],
   "@graph": [
     {

diff --git a/config/http/routes/default.json b/config/http/routes/default.json
@@ -1,12 +1,12 @@
 {
   "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@comake/solid-on-rails/^0.0.0/components/context.jsonld",
   "import": [
-    "files-sor:config/http/error-handler.json",
-    "files-sor:config/http/response-writer.json",
-    "files-sor:config/http/request-parser.json",
-    "files-sor:config/http/parameter-extractor.json",
-    "files-sor:config/http/routes/templates/application.json",
-    "files-sor:config/http/routes/handlers/index.json"
+    "sor:config/http/error-handler.json",
+    "sor:config/http/response-writer.json",
+    "sor:config/http/request-parser.json",
+    "sor:config/http/parameter-extractor.json",
+    "sor:config/http/routes/templates/application.json",
+    "sor:config/http/routes/handlers/index.json"
   ],
   "@graph": [
     {
@@ -20,13 +20,6 @@
         "comment": "Routes all requests to the proper handlers.",
         "@type": "WaterfallHandler",
         "handlers": [
-          {
-            "comment": [
-              "This handler is required to prevent Components.js issues with arrays.",
-              "This might be fixed in the next Components.js release after which this can be removed."
-            ],
-            "@type": "UnsupportedAsyncHandler"
-          },
           { "@id": "urn:solid-on-rails:default:IndexRouteHandler" }
         ]
       }

diff --git a/config/jobs/bull-no-processing.json b/config/jobs/bull-no-processing.json
@@ -1,8 +1,5 @@
 {
-  "@context": [
-    "https://linkedsoftwaredependencies.org/bundles/npm/@comake/solid-on-rails/^0.0.0/components/context.jsonld",
-    { "BullQueueAdapter:_args_queues_value": { "@type": "@json" } }
-  ],
+  "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@comake/solid-on-rails/^0.0.0/components/context.jsonld",
   "@graph": [
     {
       "@id": "urn:solid-on-rails:default:QueueAdapter",
@@ -28,7 +25,8 @@
     {
       "comment": "Makes sure the queue adapter shuts down when the application needs to stop.",
       "@id": "urn:solid-on-rails:default:Finalizer",
-      "ParallelFinalizer:_finalizers": [ { "@id": "urn:solid-on-rails:default:QueueAdapter" } ]
+      "@type": "ParallelFinalizer",
+      "finalizers": [ { "@id": "urn:solid-on-rails:default:QueueAdapter" } ]
     }
   ]
 }