@undefineds.co/xpod 0.2.41 → 0.2.43
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/config/xpod.base.json +22 -0
- package/dist/api/handlers/WebIdProfileHandler.js +9 -1
- package/dist/api/handlers/WebIdProfileHandler.js.map +1 -1
- package/dist/components/components.jsonld +1 -0
- package/dist/components/context.jsonld +30 -0
- package/dist/identity/ValidatingIdentityProviderHttpHandler.d.ts +45 -0
- package/dist/identity/ValidatingIdentityProviderHttpHandler.js +129 -0
- package/dist/identity/ValidatingIdentityProviderHttpHandler.js.map +1 -0
- package/dist/identity/ValidatingIdentityProviderHttpHandler.jsonld +124 -0
- package/dist/index.d.ts +2 -1
- package/dist/index.js +4 -2
- package/dist/index.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/ast-to-sparql.d.ts +2 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/ast-to-sparql.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/ast-to-sparql.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/comunica-patch.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/comunica-patch.js +20 -6
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/comunica-patch.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/discovery/typeindex-discovery.d.ts +2 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/discovery/typeindex-discovery.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/discovery/typeindex-discovery.js +13 -3
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/discovery/typeindex-discovery.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/execution/ldp-executor.d.ts +5 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/execution/ldp-executor.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/execution/ldp-executor.js +88 -48
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/execution/ldp-executor.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/execution/ldp-strategy.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/execution/ldp-strategy.js +5 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/execution/ldp-strategy.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/execution/pod-executor.d.ts +7 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/execution/pod-executor.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/execution/pod-executor.js +44 -14
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/execution/pod-executor.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/execution/sparql-strategy.d.ts +1 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/execution/sparql-strategy.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/execution/sparql-strategy.js +3 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/execution/sparql-strategy.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/execution/strategy-factory.d.ts +1 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/execution/strategy-factory.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/execution/strategy-factory.js +4 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/execution/strategy-factory.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/execution/types.d.ts +3 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/execution/types.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/pod-database.d.ts +44 -22
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/pod-database.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/pod-database.js +238 -44
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/pod-database.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/pod-dialect.d.ts +7 -3
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/pod-dialect.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/pod-dialect.js +33 -4
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/pod-dialect.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/pod-session.d.ts +2 -2
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/pod-session.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/query-builders/helpers.d.ts +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/query-builders/helpers.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/query-builders/helpers.js +6 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/query-builders/helpers.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/repository.d.ts +76 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/repository.d.ts.map +1 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/repository.js +132 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/repository.js.map +1 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/resource-reference.d.ts +13 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/resource-reference.d.ts.map +1 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/resource-reference.js +99 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/resource-reference.js.map +1 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/resource-resolver/base-resolver.d.ts +15 -4
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/resource-resolver/base-resolver.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/resource-resolver/base-resolver.js +65 -24
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/resource-resolver/base-resolver.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/runtime/pod-runtime.d.ts +1 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/runtime/pod-runtime.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/runtime/pod-runtime.js +7 -3
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/runtime/pod-runtime.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/select-plan.d.ts +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/select-plan.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/sparql/builder/expression-builder.d.ts +3 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/sparql/builder/expression-builder.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/sparql/builder/expression-builder.js +57 -4
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/sparql/builder/expression-builder.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/sparql/builder/update-builder.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/sparql/builder/update-builder.js +60 -45
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/sparql/builder/update-builder.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/sparql-engine.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/sparql-engine.js +5 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/sparql-engine.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/triple/builder.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/triple/builder.js +4 -2
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/triple/builder.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/triple/handlers/inverse.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/triple/handlers/inverse.js +2 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/triple/handlers/inverse.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/triple/handlers/uri.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/triple/handlers/uri.js +2 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/triple/handlers/uri.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/triple/types.d.ts +4 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/triple/types.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/uri/resolver.d.ts +8 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/uri/resolver.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/uri/resolver.js +133 -46
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/uri/resolver.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/uri/types.d.ts +4 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/uri/types.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/zod-integration.d.ts +2 -2
- package/node_modules/@undefineds.co/drizzle-solid/dist/core/zod-integration.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/ast-to-sparql.d.ts +2 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/ast-to-sparql.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/ast-to-sparql.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/comunica-patch.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/comunica-patch.js +20 -6
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/comunica-patch.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/discovery/typeindex-discovery.d.ts +2 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/discovery/typeindex-discovery.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/discovery/typeindex-discovery.js +13 -3
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/discovery/typeindex-discovery.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/execution/ldp-executor.d.ts +5 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/execution/ldp-executor.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/execution/ldp-executor.js +88 -48
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/execution/ldp-executor.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/execution/ldp-strategy.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/execution/ldp-strategy.js +5 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/execution/ldp-strategy.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/execution/pod-executor.d.ts +7 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/execution/pod-executor.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/execution/pod-executor.js +44 -14
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/execution/pod-executor.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/execution/sparql-strategy.d.ts +1 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/execution/sparql-strategy.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/execution/sparql-strategy.js +3 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/execution/sparql-strategy.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/execution/strategy-factory.d.ts +1 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/execution/strategy-factory.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/execution/strategy-factory.js +4 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/execution/strategy-factory.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/execution/types.d.ts +3 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/execution/types.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/pod-database.d.ts +44 -22
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/pod-database.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/pod-database.js +238 -44
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/pod-database.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/pod-dialect.d.ts +7 -3
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/pod-dialect.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/pod-dialect.js +33 -4
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/pod-dialect.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/pod-session.d.ts +2 -2
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/pod-session.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/query-builders/helpers.d.ts +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/query-builders/helpers.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/query-builders/helpers.js +6 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/query-builders/helpers.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/repository.d.ts +76 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/repository.d.ts.map +1 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/repository.js +127 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/repository.js.map +1 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/resource-reference.d.ts +13 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/resource-reference.d.ts.map +1 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/resource-reference.js +95 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/resource-reference.js.map +1 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/resource-resolver/base-resolver.d.ts +15 -4
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/resource-resolver/base-resolver.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/resource-resolver/base-resolver.js +65 -24
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/resource-resolver/base-resolver.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/runtime/pod-runtime.d.ts +1 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/runtime/pod-runtime.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/runtime/pod-runtime.js +7 -3
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/runtime/pod-runtime.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/select-plan.d.ts +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/select-plan.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/sparql/builder/expression-builder.d.ts +3 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/sparql/builder/expression-builder.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/sparql/builder/expression-builder.js +57 -4
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/sparql/builder/expression-builder.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/sparql/builder/update-builder.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/sparql/builder/update-builder.js +60 -45
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/sparql/builder/update-builder.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/sparql-engine.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/sparql-engine.js +5 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/sparql-engine.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/triple/builder.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/triple/builder.js +4 -2
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/triple/builder.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/triple/handlers/inverse.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/triple/handlers/inverse.js +2 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/triple/handlers/inverse.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/triple/handlers/uri.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/triple/handlers/uri.js +2 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/triple/handlers/uri.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/triple/types.d.ts +4 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/triple/types.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/uri/resolver.d.ts +8 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/uri/resolver.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/uri/resolver.js +133 -46
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/uri/resolver.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/uri/types.d.ts +4 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/uri/types.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/zod-integration.d.ts +2 -2
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/core/zod-integration.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/index.d.ts +3 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/index.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/index.js +3 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/index.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/pod.d.ts +13 -5
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/pod.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/utils/find-by-iri.d.ts +2 -2
- package/node_modules/@undefineds.co/drizzle-solid/dist/esm/utils/find-by-iri.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/index.d.ts +3 -0
- package/node_modules/@undefineds.co/drizzle-solid/dist/index.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/index.js +12 -3
- package/node_modules/@undefineds.co/drizzle-solid/dist/index.js.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/pod.d.ts +13 -5
- package/node_modules/@undefineds.co/drizzle-solid/dist/pod.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/dist/utils/find-by-iri.d.ts +2 -2
- package/node_modules/@undefineds.co/drizzle-solid/dist/utils/find-by-iri.d.ts.map +1 -1
- package/node_modules/@undefineds.co/drizzle-solid/package.json +1 -1
- package/package.json +2 -2
- package/static/app/assets/main.js +22 -22
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.parsePodResourceRef = parsePodResourceRef;
|
|
4
|
+
exports.extractPodResourceTemplateValue = extractPodResourceTemplateValue;
|
|
5
|
+
function parseTemplateVariableField(token) {
|
|
6
|
+
return token.split('|').map((part) => part.trim()).filter(Boolean)[0] ?? token;
|
|
7
|
+
}
|
|
8
|
+
function normalizeResourcePath(path) {
|
|
9
|
+
return path.trim().replace(/^(\.\/)+/, '');
|
|
10
|
+
}
|
|
11
|
+
function tableResourcePath(table) {
|
|
12
|
+
return normalizeResourcePath(table.getResourcePath?.() ?? table.config?.base ?? '');
|
|
13
|
+
}
|
|
14
|
+
function tableSubjectTemplate(table) {
|
|
15
|
+
return table.getSubjectTemplate?.() ?? table.config?.subjectTemplate ?? '{id}';
|
|
16
|
+
}
|
|
17
|
+
function isPlainId(value) {
|
|
18
|
+
return value.length > 0 && !value.includes('/') && !value.includes('#');
|
|
19
|
+
}
|
|
20
|
+
function relativeSubjectFromRef(table, ref) {
|
|
21
|
+
const resourcePath = tableResourcePath(table);
|
|
22
|
+
if (!resourcePath)
|
|
23
|
+
return null;
|
|
24
|
+
if (isPlainId(ref)) {
|
|
25
|
+
return ref;
|
|
26
|
+
}
|
|
27
|
+
const candidates = Array.from(new Set([
|
|
28
|
+
resourcePath,
|
|
29
|
+
resourcePath.replace(/^\/+/, ''),
|
|
30
|
+
resourcePath.endsWith('/') ? resourcePath.slice(0, -1) : resourcePath,
|
|
31
|
+
].filter(Boolean)));
|
|
32
|
+
for (const candidate of candidates) {
|
|
33
|
+
const index = ref.indexOf(candidate);
|
|
34
|
+
if (index < 0)
|
|
35
|
+
continue;
|
|
36
|
+
let relative = ref.slice(index + candidate.length);
|
|
37
|
+
if (relative.startsWith('/'))
|
|
38
|
+
relative = relative.slice(1);
|
|
39
|
+
if (relative.length > 0)
|
|
40
|
+
return relative;
|
|
41
|
+
}
|
|
42
|
+
return null;
|
|
43
|
+
}
|
|
44
|
+
function extractTemplateValues(relativeSubject, template) {
|
|
45
|
+
if (!template.includes('{')) {
|
|
46
|
+
return relativeSubject === template ? {} : null;
|
|
47
|
+
}
|
|
48
|
+
let groupIndex = 0;
|
|
49
|
+
const groupToField = new Map();
|
|
50
|
+
let regexText = template
|
|
51
|
+
.replace(/[.+?^$[\]\\()]/g, '\\$&')
|
|
52
|
+
.replace(/\{([^}]+)\}/g, (_match, token) => {
|
|
53
|
+
const groupName = `var${groupIndex++}`;
|
|
54
|
+
groupToField.set(groupName, parseTemplateVariableField(token));
|
|
55
|
+
return `(?<${groupName}>.+?)`;
|
|
56
|
+
});
|
|
57
|
+
regexText = `^${regexText}$`;
|
|
58
|
+
try {
|
|
59
|
+
const match = relativeSubject.match(new RegExp(regexText));
|
|
60
|
+
if (!match?.groups)
|
|
61
|
+
return null;
|
|
62
|
+
const values = {};
|
|
63
|
+
for (const [groupName, value] of Object.entries(match.groups)) {
|
|
64
|
+
const field = groupToField.get(groupName);
|
|
65
|
+
if (!field || value === undefined)
|
|
66
|
+
continue;
|
|
67
|
+
const decoded = decodeURIComponent(value);
|
|
68
|
+
if (field in values && values[field] !== decoded)
|
|
69
|
+
return null;
|
|
70
|
+
values[field] = decoded;
|
|
71
|
+
}
|
|
72
|
+
return values;
|
|
73
|
+
}
|
|
74
|
+
catch {
|
|
75
|
+
return null;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
function parsePodResourceRef(table, ref) {
|
|
79
|
+
if (!ref)
|
|
80
|
+
return null;
|
|
81
|
+
if (isPlainId(ref)) {
|
|
82
|
+
return {
|
|
83
|
+
resourceId: ref,
|
|
84
|
+
templateValues: { id: ref },
|
|
85
|
+
};
|
|
86
|
+
}
|
|
87
|
+
const relativeSubject = relativeSubjectFromRef(table, ref);
|
|
88
|
+
if (!relativeSubject)
|
|
89
|
+
return null;
|
|
90
|
+
const templateValues = extractTemplateValues(relativeSubject, tableSubjectTemplate(table)) ?? {};
|
|
91
|
+
return {
|
|
92
|
+
resourceId: decodeURIComponent(relativeSubject),
|
|
93
|
+
templateValues,
|
|
94
|
+
};
|
|
95
|
+
}
|
|
96
|
+
function extractPodResourceTemplateValue(table, ref, field = 'id') {
|
|
97
|
+
return parsePodResourceRef(table, ref)?.templateValues[field] ?? null;
|
|
98
|
+
}
|
|
99
|
+
//# sourceMappingURL=resource-reference.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resource-reference.js","sourceRoot":"","sources":["../../src/core/resource-reference.ts"],"names":[],"mappings":"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"}
|
package/node_modules/@undefineds.co/drizzle-solid/dist/core/resource-resolver/base-resolver.d.ts
CHANGED
|
@@ -25,15 +25,16 @@ export declare abstract class BaseResourceResolver implements ResourceResolver {
|
|
|
25
25
|
abstract resolveSelectSources(table: PodTable, containerUrl: string, condition?: QueryCondition, listContainer?: (url?: string) => Promise<string[]>): Promise<string[]>;
|
|
26
26
|
abstract resolveSubjectsForMutation(table: PodTable, condition: QueryCondition, findSubjects: (resourceUrl: string) => Promise<string[]>, listContainer: () => Promise<string[]>): Promise<string[]>;
|
|
27
27
|
/**
|
|
28
|
-
* 从 subject URI 解析出 id
|
|
28
|
+
* 从 subject URI 解析出 ORM row id。
|
|
29
29
|
*
|
|
30
|
-
*
|
|
31
|
-
*
|
|
32
|
-
*
|
|
30
|
+
* `id()` 是虚拟列,不写入 RDF 谓词;它暴露的是 subjectTemplate 中的
|
|
31
|
+
* 本地 `{id}`,而不是完整 IRI 或 base-relative resource id。
|
|
32
|
+
* 需要 base-relative resource id 时使用 parsePodResourceRef/resolveResourceId。
|
|
33
33
|
*
|
|
34
34
|
* 例如:
|
|
35
35
|
* - uri = "http://pod/items/alice.ttl#it", template = "{id}.ttl#it" → id = "alice"
|
|
36
36
|
* - uri = "http://pod/tags.ttl#tag-1", template = "#{id}" → id = "tag-1"
|
|
37
|
+
* - uri = "http://pod/a/2026/05/07.ttl#x", template = "{yyyy}/{MM}/{dd}.ttl#{id}" → id = "x"
|
|
37
38
|
*/
|
|
38
39
|
parseId(table: PodTable, subjectUri: string): string;
|
|
39
40
|
/**
|
|
@@ -44,6 +45,16 @@ export declare abstract class BaseResourceResolver implements ResourceResolver {
|
|
|
44
45
|
* 2. subjectUri = baseUrl + relativePath
|
|
45
46
|
*/
|
|
46
47
|
resolveSubject(table: PodTable, record: Record<string, any>, index?: number): string;
|
|
48
|
+
/**
|
|
49
|
+
* Extract the local template `{id}` variable for template transforms and link
|
|
50
|
+
* normalization. This is distinct from the public `id()` resource locator.
|
|
51
|
+
*/
|
|
52
|
+
protected parseTemplateId(table: PodTable, subjectUri: string): string | null;
|
|
53
|
+
protected extractRelativeSubjectId(table: PodTable, subjectUri: string): string;
|
|
54
|
+
private extractTemplateRelativeSubjectId;
|
|
55
|
+
protected isBaseRelativeSubjectId(value: string): boolean;
|
|
56
|
+
protected resolveBaseRelativeSubjectId(table: PodTable, value: string): string | null;
|
|
57
|
+
protected hasVirtualIdColumn(table: PodTable): boolean;
|
|
47
58
|
/**
|
|
48
59
|
* 获取表的 base URL,用于 id 解析
|
|
49
60
|
*/
|
package/node_modules/@undefineds.co/drizzle-solid/dist/core/resource-resolver/base-resolver.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-resolver.d.ts","sourceRoot":"","sources":["../../../src/core/resource-resolver/base-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEhD,UAAU,gBAAgB;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,8BAAsB,oBAAqB,YAAW,gBAAgB;IACpE,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU,CAAC;IAEhD,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC;gBAEjB,UAAU,EAAE,MAAM;IAI9B,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM;IACjD,QAAQ,CAAC,cAAc,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM;IAChD,QAAQ,CAAC,wBAAwB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAE7D,QAAQ,CAAC,oBAAoB,CAC3B,KAAK,EAAE,QAAQ,EACf,YAAY,EAAE,MAAM,EACpB,SAAS,CAAC,EAAE,cAAc,EAC1B,aAAa,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,GAClD,OAAO,CAAC,MAAM,EAAE,CAAC;IAEpB,QAAQ,CAAC,0BAA0B,CACjC,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,cAAc,EACzB,YAAY,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,EACxD,aAAa,EAAE,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC,GACrC,OAAO,CAAC,MAAM,EAAE,CAAC;IAIpB
|
|
1
|
+
{"version":3,"file":"base-resolver.d.ts","sourceRoot":"","sources":["../../../src/core/resource-resolver/base-resolver.ts"],"names":[],"mappings":"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"}
|
package/node_modules/@undefineds.co/drizzle-solid/dist/core/resource-resolver/base-resolver.js
CHANGED
|
@@ -16,36 +16,19 @@ class BaseResourceResolver {
|
|
|
16
16
|
}
|
|
17
17
|
// ================= 统一的 id 解析逻辑 =================
|
|
18
18
|
/**
|
|
19
|
-
* 从 subject URI 解析出 id
|
|
19
|
+
* 从 subject URI 解析出 ORM row id。
|
|
20
20
|
*
|
|
21
|
-
*
|
|
22
|
-
*
|
|
23
|
-
*
|
|
21
|
+
* `id()` 是虚拟列,不写入 RDF 谓词;它暴露的是 subjectTemplate 中的
|
|
22
|
+
* 本地 `{id}`,而不是完整 IRI 或 base-relative resource id。
|
|
23
|
+
* 需要 base-relative resource id 时使用 parsePodResourceRef/resolveResourceId。
|
|
24
24
|
*
|
|
25
25
|
* 例如:
|
|
26
26
|
* - uri = "http://pod/items/alice.ttl#it", template = "{id}.ttl#it" → id = "alice"
|
|
27
27
|
* - uri = "http://pod/tags.ttl#tag-1", template = "#{id}" → id = "tag-1"
|
|
28
|
+
* - uri = "http://pod/a/2026/05/07.ttl#x", template = "{yyyy}/{MM}/{dd}.ttl#{id}" → id = "x"
|
|
28
29
|
*/
|
|
29
30
|
parseId(table, subjectUri) {
|
|
30
|
-
|
|
31
|
-
// Step 1: 计算相对路径
|
|
32
|
-
let relativePath;
|
|
33
|
-
if (subjectUri.startsWith(baseUrl)) {
|
|
34
|
-
relativePath = subjectUri.substring(baseUrl.length);
|
|
35
|
-
}
|
|
36
|
-
else {
|
|
37
|
-
relativePath = this.extractIdFallback(subjectUri);
|
|
38
|
-
}
|
|
39
|
-
// Step 2: 根据模板反向解析 {id}
|
|
40
|
-
const template = this.getEffectiveTemplate(table);
|
|
41
|
-
if (template) {
|
|
42
|
-
const extractedId = this.extractIdFromTemplate(relativePath, template);
|
|
43
|
-
if (extractedId !== null) {
|
|
44
|
-
return extractedId;
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
// 如果没有模板或解析失败,返回相对路径
|
|
48
|
-
return relativePath;
|
|
31
|
+
return this.parseTemplateId(table, subjectUri) ?? this.extractRelativeSubjectId(table, subjectUri);
|
|
49
32
|
}
|
|
50
33
|
/**
|
|
51
34
|
* 从 id 构建完整的 subject URI
|
|
@@ -62,6 +45,12 @@ class BaseResourceResolver {
|
|
|
62
45
|
if (id && this.isAbsoluteUri(id)) {
|
|
63
46
|
return id;
|
|
64
47
|
}
|
|
48
|
+
if (typeof id === 'string') {
|
|
49
|
+
const subjectFromRelativeId = this.resolveBaseRelativeSubjectId(table, id);
|
|
50
|
+
if (subjectFromRelativeId) {
|
|
51
|
+
return subjectFromRelativeId;
|
|
52
|
+
}
|
|
53
|
+
}
|
|
65
54
|
// 如果没有 id,生成 UUID
|
|
66
55
|
if (id === undefined || id === null) {
|
|
67
56
|
id = this.generateUuid();
|
|
@@ -71,6 +60,54 @@ class BaseResourceResolver {
|
|
|
71
60
|
const relativePath = this.applyTemplate({ ...record, id }, template, table, index);
|
|
72
61
|
return baseUrl + relativePath;
|
|
73
62
|
}
|
|
63
|
+
/**
|
|
64
|
+
* Extract the local template `{id}` variable for template transforms and link
|
|
65
|
+
* normalization. This is distinct from the public `id()` resource locator.
|
|
66
|
+
*/
|
|
67
|
+
parseTemplateId(table, subjectUri) {
|
|
68
|
+
const relativePath = this.extractTemplateRelativeSubjectId(table, subjectUri);
|
|
69
|
+
return this.extractIdFromTemplate(relativePath, this.getEffectiveTemplate(table));
|
|
70
|
+
}
|
|
71
|
+
extractRelativeSubjectId(table, subjectUri) {
|
|
72
|
+
const baseUrl = this.getBaseUrlForTable(table);
|
|
73
|
+
if (subjectUri.startsWith(baseUrl)) {
|
|
74
|
+
return subjectUri.substring(baseUrl.length);
|
|
75
|
+
}
|
|
76
|
+
return this.extractIdFallback(subjectUri);
|
|
77
|
+
}
|
|
78
|
+
extractTemplateRelativeSubjectId(table, subjectUri) {
|
|
79
|
+
const baseUrl = this.resolveBaseUrl(table);
|
|
80
|
+
if (subjectUri.startsWith(baseUrl)) {
|
|
81
|
+
return subjectUri.substring(baseUrl.length);
|
|
82
|
+
}
|
|
83
|
+
return this.extractRelativeSubjectId(table, subjectUri);
|
|
84
|
+
}
|
|
85
|
+
isBaseRelativeSubjectId(value) {
|
|
86
|
+
if (!value || this.isAbsoluteUri(value) || value.startsWith('/')) {
|
|
87
|
+
return false;
|
|
88
|
+
}
|
|
89
|
+
return (value.startsWith('#') ||
|
|
90
|
+
value.includes('#') ||
|
|
91
|
+
/\.(ttl|jsonld|json)(?:#|$)/i.test(value));
|
|
92
|
+
}
|
|
93
|
+
resolveBaseRelativeSubjectId(table, value) {
|
|
94
|
+
if (!this.isBaseRelativeSubjectId(value)) {
|
|
95
|
+
return null;
|
|
96
|
+
}
|
|
97
|
+
const baseUrl = this.getBaseUrlForTable(table);
|
|
98
|
+
if (value.startsWith('#')) {
|
|
99
|
+
return `${baseUrl.endsWith('/') ? baseUrl.slice(0, -1) : baseUrl}${value}`;
|
|
100
|
+
}
|
|
101
|
+
if (baseUrl.endsWith('/')) {
|
|
102
|
+
return `${baseUrl}${value}`;
|
|
103
|
+
}
|
|
104
|
+
const lastSlash = baseUrl.lastIndexOf('/');
|
|
105
|
+
const containerUrl = lastSlash >= 0 ? baseUrl.slice(0, lastSlash + 1) : `${baseUrl}/`;
|
|
106
|
+
return `${containerUrl}${value}`;
|
|
107
|
+
}
|
|
108
|
+
hasVirtualIdColumn(table) {
|
|
109
|
+
return Boolean(table.columns?.id?._virtualId);
|
|
110
|
+
}
|
|
74
111
|
/**
|
|
75
112
|
* 获取表的 base URL,用于 id 解析
|
|
76
113
|
*/
|
|
@@ -358,13 +395,17 @@ class BaseResourceResolver {
|
|
|
358
395
|
return this.extractTemplateId(stringValue, table, field);
|
|
359
396
|
}
|
|
360
397
|
extractTemplateId(value, table, field) {
|
|
398
|
+
if (value.startsWith('/')) {
|
|
399
|
+
const podBase = this.podBaseUrl.endsWith('/') ? this.podBaseUrl : `${this.podBaseUrl}/`;
|
|
400
|
+
value = new URL(value.replace(/^\/+/, ''), podBase).toString();
|
|
401
|
+
}
|
|
361
402
|
if (!this.isAbsoluteUri(value)) {
|
|
362
403
|
return value;
|
|
363
404
|
}
|
|
364
405
|
const column = table && field ? table.columns?.[field] : undefined;
|
|
365
406
|
const linkedTable = column?.getLinkTable?.() ?? column?.options?.linkTable;
|
|
366
407
|
if (linkedTable) {
|
|
367
|
-
return this.parseId(linkedTable, value);
|
|
408
|
+
return this.parseTemplateId(linkedTable, value) ?? this.parseId(linkedTable, value);
|
|
368
409
|
}
|
|
369
410
|
const fallback = this.extractIdFallback(value);
|
|
370
411
|
return fallback.startsWith('#') ? fallback.slice(1) : fallback.replace(/\.ttl$/i, '');
|
package/node_modules/@undefineds.co/drizzle-solid/dist/core/resource-resolver/base-resolver.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-resolver.js","sourceRoot":"","sources":["../../../src/core/resource-resolver/base-resolver.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"base-resolver.js","sourceRoot":"","sources":["../../../src/core/resource-resolver/base-resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pod-runtime.d.ts","sourceRoot":"","sources":["../../../src/core/runtime/pod-runtime.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AASvD,qBAAa,UAAU;IACrB,OAAO,CAAC,OAAO,CAAmB;IAClC,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,iBAAiB,CAAa;IACtC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,YAAY,CAA6B;IACjD,OAAO,CAAC,kBAAkB,CAAwB;
|
|
1
|
+
{"version":3,"file":"pod-runtime.d.ts","sourceRoot":"","sources":["../../../src/core/runtime/pod-runtime.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AASvD,qBAAa,UAAU;IACrB,OAAO,CAAC,OAAO,CAAmB;IAClC,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,iBAAiB,CAAa;IACtC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,YAAY,CAA6B;IACjD,OAAO,CAAC,kBAAkB,CAAwB;IAClD,OAAO,CAAC,cAAc,CAAU;IAEhC,6BAA6B;IAC7B,OAAO,CAAC,UAAU,CAAyB;gBAE/B,OAAO,EAAE;QAAE,OAAO,EAAE,gBAAgB,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE;IAUvG;;;OAGG;YACW,sBAAsB;IAUpC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAwB1B,UAAU,IAAI,gBAAgB;IAI9B;;OAEG;IACH,QAAQ,IAAI,OAAO,KAAK;IAOxB,QAAQ,IAAI,MAAM;IAIlB,SAAS,IAAI,MAAM;IAInB;;;OAGG;IACH,aAAa,IAAI,MAAM,GAAG,IAAI;IAI9B;;OAEG;IACH,gBAAgB,IAAI,OAAO;IAK3B;;;OAGG;IACG,oBAAoB,IAAI,OAAO,CAAC,MAAM,CAAC;IAO7C;;;OAGG;IACG,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAgB9C,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAK5B,WAAW,IAAI,OAAO;IAIhB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA2DxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;CAIlC"}
|
|
@@ -21,6 +21,7 @@ class PodRuntime {
|
|
|
21
21
|
this.session = options.session;
|
|
22
22
|
this.webId = options.webId;
|
|
23
23
|
this.podUrl = (0, pod_root_1.resolvePodBase)({ webId: this.webId, podUrl: options.podUrl });
|
|
24
|
+
this.explicitPodUrl = typeof options.podUrl === 'string' && options.podUrl.trim().length > 0;
|
|
24
25
|
if (options.storageTTL !== undefined) {
|
|
25
26
|
this.storageTTL = options.storageTTL;
|
|
26
27
|
}
|
|
@@ -113,7 +114,7 @@ class PodRuntime {
|
|
|
113
114
|
if (resolvedStorage) {
|
|
114
115
|
this.storageUrl = resolvedStorage;
|
|
115
116
|
this.storageResolvedAt = Date.now();
|
|
116
|
-
if (resolvedStorage !== this.podUrl) {
|
|
117
|
+
if (!this.explicitPodUrl && resolvedStorage !== this.podUrl) {
|
|
117
118
|
console.log(`[PodRuntime] Storage refreshed: ${resolvedStorage}`);
|
|
118
119
|
this.podUrl = resolvedStorage;
|
|
119
120
|
}
|
|
@@ -144,7 +145,7 @@ class PodRuntime {
|
|
|
144
145
|
this.storageUrl = resolvedStorage;
|
|
145
146
|
this.storageResolvedAt = Date.now();
|
|
146
147
|
// 如果 storage URL 与当前 podUrl 不同,更新 podUrl
|
|
147
|
-
if (resolvedStorage !== this.podUrl) {
|
|
148
|
+
if (!this.explicitPodUrl && resolvedStorage !== this.podUrl) {
|
|
148
149
|
console.log(`[PodRuntime] IdP-SP separation detected: storage at ${resolvedStorage}`);
|
|
149
150
|
this.podUrl = resolvedStorage;
|
|
150
151
|
}
|
|
@@ -154,13 +155,16 @@ class PodRuntime {
|
|
|
154
155
|
method: 'HEAD',
|
|
155
156
|
});
|
|
156
157
|
const status = response.status;
|
|
157
|
-
if (status === 500) {
|
|
158
|
+
if (status === 500 && !this.explicitPodUrl) {
|
|
158
159
|
const requestId = this.requestIdSupported
|
|
159
160
|
? (response.headers.get('X-Request-ID') || 'unknown')
|
|
160
161
|
: 'disabled';
|
|
161
162
|
console.error(`Pod probe failed, X-Request-ID: ${requestId}`);
|
|
162
163
|
throw new Error(`Failed to connect to Pod: ${status} ${response.statusText}`);
|
|
163
164
|
}
|
|
165
|
+
if (status === 500 && this.explicitPodUrl) {
|
|
166
|
+
console.warn(`Pod root returned ${status} for explicit Pod URL, continuing (child resources may still be writable)`);
|
|
167
|
+
}
|
|
164
168
|
if (response.ok) {
|
|
165
169
|
console.log('Successfully connected to Solid Pod');
|
|
166
170
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pod-runtime.js","sourceRoot":"","sources":["../../../src/core/runtime/pod-runtime.ts"],"names":[],"mappings":";;;AAAA,gDAAmD;AACnD,+DAA2D;AAG3D,YAAY;AACZ,SAAS,iBAAiB;IACxB,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1D,OAAO,GAAG,SAAS,IAAI,MAAM,EAAE,CAAC;AAClC,CAAC;AAED,MAAa,UAAU;
|
|
1
|
+
{"version":3,"file":"pod-runtime.js","sourceRoot":"","sources":["../../../src/core/runtime/pod-runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { PodTable, PodColumnBase } from './schema';
|
|
2
2
|
import { AggregateExpression } from './aggregates';
|
|
3
3
|
import { QueryCondition } from './query-conditions';
|
|
4
|
-
type GenericPodTable = PodTable<
|
|
4
|
+
type GenericPodTable = PodTable<any>;
|
|
5
5
|
export type SelectField = PodColumnBase | GenericPodTable | string | AggregateExpression | SelectFieldMap;
|
|
6
6
|
export interface SelectFieldMap {
|
|
7
7
|
[key: string]: SelectField;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"select-plan.d.ts","sourceRoot":"","sources":["../../src/core/select-plan.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,KAAK,eAAe,GAAG,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"select-plan.d.ts","sourceRoot":"","sources":["../../src/core/select-plan.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,KAAK,eAAe,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;AAErC,MAAM,MAAM,WAAW,GAAG,aAAa,GAAG,eAAe,GAAG,MAAM,GAAG,mBAAmB,GAAG,cAAc,CAAC;AAC1G,MAAM,WAAW,cAAc;IAC7B,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAC;CAC5B;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,eAAe,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,eAAe,CAAC;IACtB,KAAK,EAAE,eAAe,CAAC;CACxB;AAED,MAAM,MAAM,QAAQ,GAAG,UAAU,GAAG,WAAW,GAAG,WAAW,GAAG,UAAU,GAAG,WAAW,CAAC;AAEzF,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,eAAe,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,aAAa,EAAE,CAAC;IAC5B,OAAO,CAAC,EAAE,cAAc,EAAE,CAAC;CAC5B;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,KAAK,GAAG,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,eAAe,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,aAAa,CAAC,EAAE,cAAc,CAAC;IAC/B,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC;IACnB,WAAW,CAAC,EAAE,cAAc,EAAE,CAAC;IAC/B,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;IAC5B,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB,OAAO,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAC9B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC3C,YAAY,EAAE,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;CAC5C"}
|
package/node_modules/@undefineds.co/drizzle-solid/dist/core/sparql/builder/expression-builder.d.ts
CHANGED
|
@@ -29,6 +29,9 @@ export declare class ExpressionBuilder {
|
|
|
29
29
|
* Uses uriResolver for consistent URI resolution
|
|
30
30
|
*/
|
|
31
31
|
private formatLinkValue;
|
|
32
|
+
private isPartialTemplateError;
|
|
33
|
+
private isPartialLinkValue;
|
|
34
|
+
private formatPartialLinkCondition;
|
|
32
35
|
private parseTemplateVariable;
|
|
33
36
|
private getTemplateVariableFields;
|
|
34
37
|
private getMissingLocatorVariables;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expression-builder.d.ts","sourceRoot":"","sources":["../../../../src/core/sparql/builder/expression-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAAE,QAAQ,EAAiB,MAAM,cAAc,CAAC;AAEvD,OAAO,KAAK,EAAc,WAAW,EAAE,MAAM,WAAW,CAAC;AAEzD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"expression-builder.d.ts","sourceRoot":"","sources":["../../../../src/core/sparql/builder/expression-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAAE,QAAQ,EAAiB,MAAM,cAAc,CAAC;AAEvD,OAAO,KAAK,EAAc,WAAW,EAAE,MAAM,WAAW,CAAC;AAEzD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAIhE,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,YAAY,CAAC,CAAuB;IAC5C,OAAO,CAAC,WAAW,CAAc;gBAErB,WAAW,GAAE,WAAmC;IAI5D;;OAEG;IACH,eAAe,CAAC,OAAO,EAAE,oBAAoB,GAAG,IAAI;IAIpD;;OAEG;IACH,OAAO,CAAC,aAAa;IASrB,gBAAgB,CAAC,SAAS,EAAE,cAAc,GAAG,GAAG,EAAE,KAAK,EAAE,QAAQ,GAAG,MAAM;IAK1E,wBAAwB,CACtB,SAAS,EAAE,cAAc,GAAG,GAAG,EAC/B,KAAK,EAAE,QAAQ,GACd;QAAE,MAAM,EAAE,MAAM,EAAE,CAAC;QAAC,kBAAkB,CAAC,EAAE,cAAc,GAAG,GAAG,CAAA;KAAE,GAAG,IAAI;IASzE;;;OAGG;IACH,OAAO,CAAC,YAAY;IAIpB;;;OAGG;IACH,OAAO,CAAC,eAAe;IAqCvB,OAAO,CAAC,sBAAsB;IAM9B,OAAO,CAAC,kBAAkB;IAQ1B,OAAO,CAAC,0BAA0B;IAoBlC,OAAO,CAAC,qBAAqB;IAY7B,OAAO,CAAC,yBAAyB;IAejC,OAAO,CAAC,0BAA0B;IAMlC,OAAO,CAAC,wBAAwB;IAUhC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAgC1B;;OAEG;IACH,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,eAAe;IAsBvB,OAAO,CAAC,sBAAsB;IAa9B,OAAO,CAAC,gCAAgC;IA0DxC,OAAO,CAAC,kCAAkC;IAmC1C,OAAO,CAAC,wCAAwC;IAwEhD,OAAO,CAAC,oBAAoB;IAuC5B,OAAO,CAAC,qBAAqB;IAqH7B,OAAO,CAAC,iBAAiB;CAa1B"}
|
package/node_modules/@undefineds.co/drizzle-solid/dist/core/sparql/builder/expression-builder.js
CHANGED
|
@@ -63,6 +63,9 @@ class ExpressionBuilder {
|
|
|
63
63
|
catch (error) {
|
|
64
64
|
const tableName = table.config?.name ?? 'unknown';
|
|
65
65
|
const columnName = column?.name ?? 'unknown';
|
|
66
|
+
if (this.isPartialTemplateError(error)) {
|
|
67
|
+
return { partial: true, id: inner };
|
|
68
|
+
}
|
|
66
69
|
throw new Error(`[ExpressionBuilder] Failed to resolve URI for ${tableName}.${columnName}: ${error}`);
|
|
67
70
|
}
|
|
68
71
|
}
|
|
@@ -77,9 +80,37 @@ class ExpressionBuilder {
|
|
|
77
80
|
catch (e) {
|
|
78
81
|
const tableName = table.config?.name ?? 'unknown';
|
|
79
82
|
const columnName = column?.name ?? 'unknown';
|
|
83
|
+
if (this.isPartialTemplateError(e)) {
|
|
84
|
+
return { partial: true, id: str };
|
|
85
|
+
}
|
|
80
86
|
throw new Error(`[ExpressionBuilder] Failed to resolve URI for ${tableName}.${columnName}: ${e}`);
|
|
81
87
|
}
|
|
82
88
|
}
|
|
89
|
+
isPartialTemplateError(error) {
|
|
90
|
+
const message = String(error);
|
|
91
|
+
return message.includes('Missing required fields for template') ||
|
|
92
|
+
message.includes('Unresolved URI template variable');
|
|
93
|
+
}
|
|
94
|
+
isPartialLinkValue(value) {
|
|
95
|
+
return typeof value === 'object' &&
|
|
96
|
+
value !== null &&
|
|
97
|
+
!Array.isArray(value) &&
|
|
98
|
+
value.partial === true &&
|
|
99
|
+
typeof value.id === 'string';
|
|
100
|
+
}
|
|
101
|
+
formatPartialLinkCondition(variable, value, operator) {
|
|
102
|
+
if (!this.isPartialLinkValue(value)) {
|
|
103
|
+
return undefined;
|
|
104
|
+
}
|
|
105
|
+
const escapedId = value.id.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
|
|
106
|
+
if (operator === '=') {
|
|
107
|
+
return `STRENDS(STR(${variable}), "#${escapedId}")`;
|
|
108
|
+
}
|
|
109
|
+
if (operator === '!=') {
|
|
110
|
+
return `!STRENDS(STR(${variable}), "#${escapedId}")`;
|
|
111
|
+
}
|
|
112
|
+
return undefined;
|
|
113
|
+
}
|
|
83
114
|
parseTemplateVariable(token) {
|
|
84
115
|
const [field, ...transforms] = token
|
|
85
116
|
.split('|')
|
|
@@ -367,12 +398,26 @@ class ExpressionBuilder {
|
|
|
367
398
|
const expr = `${variable} IN(${formattedValues})`;
|
|
368
399
|
return condition.operator === 'NOT IN' ? `!(${expr})` : expr;
|
|
369
400
|
}
|
|
370
|
-
const
|
|
401
|
+
const formattedResults = value.map((v) => {
|
|
371
402
|
if (isLink) {
|
|
372
403
|
return this.formatLinkValue(v, column, table);
|
|
373
404
|
}
|
|
374
405
|
return (0, helpers_1.formatValue)(v, column, this.uriResolver, this.getUriContext());
|
|
375
|
-
})
|
|
406
|
+
});
|
|
407
|
+
const hasPartialLink = formattedResults.some((result) => this.isPartialLinkValue(result));
|
|
408
|
+
if (hasPartialLink) {
|
|
409
|
+
const conditions = formattedResults.map((result) => {
|
|
410
|
+
if (this.isPartialLinkValue(result)) {
|
|
411
|
+
const escapedId = result.id.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
|
|
412
|
+
return `STRENDS(STR(${variable}), "#${escapedId}")`;
|
|
413
|
+
}
|
|
414
|
+
const formatted = Array.isArray(result) ? result.join(', ') : result;
|
|
415
|
+
return `(${variable} = ${formatted})`;
|
|
416
|
+
});
|
|
417
|
+
const expr = `(${conditions.join(' || ')})`;
|
|
418
|
+
return condition.operator === 'NOT IN' ? `!(${expr})` : expr;
|
|
419
|
+
}
|
|
420
|
+
const formattedValues = formattedResults.join(', ');
|
|
376
421
|
const expr = `${variable} IN(${formattedValues})`;
|
|
377
422
|
return condition.operator === 'NOT IN' ? `!(${expr})` : expr;
|
|
378
423
|
}
|
|
@@ -414,8 +459,16 @@ class ExpressionBuilder {
|
|
|
414
459
|
formattedValue = this.formatSubjectValue(value, table, isVirtualId);
|
|
415
460
|
}
|
|
416
461
|
else if (isLink) {
|
|
417
|
-
// Resolve link URI
|
|
418
|
-
|
|
462
|
+
// Resolve link URI. If the target template requires variables that this
|
|
463
|
+
// single predicate cannot provide, fall back to an id-fragment suffix.
|
|
464
|
+
const linkValue = this.formatLinkValue(value, column, table);
|
|
465
|
+
const partialCondition = this.formatPartialLinkCondition(variable, linkValue, condition.operator);
|
|
466
|
+
if (partialCondition) {
|
|
467
|
+
return partialCondition;
|
|
468
|
+
}
|
|
469
|
+
formattedValue = this.isPartialLinkValue(linkValue)
|
|
470
|
+
? `"${linkValue.id.replace(/\\/g, '\\\\').replace(/"/g, '\\"')}"`
|
|
471
|
+
: linkValue;
|
|
419
472
|
}
|
|
420
473
|
else {
|
|
421
474
|
formattedValue = (0, helpers_1.formatValue)(value, column, this.uriResolver, this.getUriContext());
|