From aecfdbb6449329aa2c8f35372b556d98632c2b20 Mon Sep 17 00:00:00 2001 From: Jackson Morgan Date: Fri, 16 May 2025 15:18:28 -0400 Subject: [PATCH] jsonld-dataset-proxy esm migration --- .../test/integration.test.ts | 2 +- .../connected-solid/test/Integration.test.ts | 4 ++-- ...socket2023NotificationSubscription.test.ts | 4 ++-- .../connected-solid/test/uriTypes.test.ts | 2 +- .../test/LinkTraversalIntegration.test.ts | 2 +- packages/connected/test/mocks/MockResource.ts | 4 ++-- .../dataset/example/extendedDatasetExample.ts | 4 ++-- packages/dataset/example/loadDataExample.ts | 2 +- packages/jsonld-dataset-proxy/jest.config.cjs | 14 +++++++++++++ packages/jsonld-dataset-proxy/jest.config.js | 6 ------ packages/jsonld-dataset-proxy/package.json | 20 +++++++++++++++---- .../test/BasicLdSet.test.ts | 2 +- .../jsonld-dataset-proxy/test/isProxy.test.ts | 2 +- .../test/jsonldDatasetProxy.test.ts | 4 ++-- .../test/nodeToJsonRepresentation.test.ts | 2 +- .../test/nodeToString.test.ts | 2 +- .../test/patientExampleData.ts | 2 +- .../jsonld-dataset-proxy/tsconfig.build.json | 7 ------- .../jsonld-dataset-proxy/tsconfig.cjs.json | 10 ++++++++++ .../jsonld-dataset-proxy/tsconfig.esm.json | 11 ++++++++++ packages/ldo/test/LdoDataset.test.ts | 4 ++-- packages/ldo/test/methods.test.ts | 2 +- packages/ldo/test/profileData.ts | 2 +- .../test/Solid-Integration.test.tsx | 2 +- .../example/subscribableDatasetExample.ts | 2 +- .../test/SubscribableDataset.test.ts | 2 ++ ...cribableDatasetFromSerializedInput.test.ts | 2 ++ packages/type-traverser/example/example.ts | 4 ++-- 28 files changed, 82 insertions(+), 44 deletions(-) create mode 100644 packages/jsonld-dataset-proxy/jest.config.cjs delete mode 100644 packages/jsonld-dataset-proxy/jest.config.js delete mode 100644 packages/jsonld-dataset-proxy/tsconfig.build.json create mode 100644 packages/jsonld-dataset-proxy/tsconfig.cjs.json create mode 100644 packages/jsonld-dataset-proxy/tsconfig.esm.json diff --git a/packages/connected-nextgraph/test/integration.test.ts b/packages/connected-nextgraph/test/integration.test.ts index dba0bc9..6198813 100644 --- a/packages/connected-nextgraph/test/integration.test.ts +++ b/packages/connected-nextgraph/test/integration.test.ts @@ -4,7 +4,7 @@ import type { NextGraphConnectedPlugin, NextGraphResource, NextGraphUri, -} from "../src.js"; +} from "../src/index.js"; import { createNextGraphLdoDataset } from "../src/createNextGraphLdoDataset.js"; import { parseRdf } from "@ldo/ldo"; import { namedNode } from "@rdfjs/data-model"; diff --git a/packages/connected-solid/test/Integration.test.ts b/packages/connected-solid/test/Integration.test.ts index e5713fd..17773b3 100644 --- a/packages/connected-solid/test/Integration.test.ts +++ b/packages/connected-solid/test/Integration.test.ts @@ -16,7 +16,7 @@ import type { NoncompliantPodError } from "../src/requester/results/error/Noncom import type { GetStorageContainerFromWebIdSuccess } from "../src/requester/results/success/CheckRootContainerSuccess.js"; import { wait } from "./utils.helper.js"; import path from "path"; -import type { GetWacRuleSuccess, UpdateResultError, WacRule } from "../src.js"; +import type { GetWacRuleSuccess, UpdateResultError, WacRule } from "../src/index.js"; import { createSolidLdoDataset, type SolidConnectedPlugin, @@ -24,7 +24,7 @@ import { type SolidContainerUri, type SolidLeaf, type SolidLeafUri, -} from "../src.js"; +} from "../src/index.js"; import type { AggregateError, AggregateSuccess, diff --git a/packages/connected-solid/test/Websocket2023NotificationSubscription.test.ts b/packages/connected-solid/test/Websocket2023NotificationSubscription.test.ts index fd875aa..b1d8637 100644 --- a/packages/connected-solid/test/Websocket2023NotificationSubscription.test.ts +++ b/packages/connected-solid/test/Websocket2023NotificationSubscription.test.ts @@ -6,8 +6,8 @@ describe("Websocket Trivial", () => { // import type { WebSocket, Event, ErrorEvent } from "ws"; // import { Websocket2023NotificationSubscription } from "../src/notifications/Websocket2023NotificationSubscription.js"; -// import type { SolidLdoDatasetContext } from "../src.js"; -// import { Leaf } from "../src.js"; +// import type { SolidLdoDatasetContext } from "../src/index.js"; +// import { Leaf } from "../src/index.js"; // import type { NotificationChannel } from "@solid-notifications/types"; // describe("Websocket2023NotificationSubscription", () => { diff --git a/packages/connected-solid/test/uriTypes.test.ts b/packages/connected-solid/test/uriTypes.test.ts index eb78c8b..9ca4393 100644 --- a/packages/connected-solid/test/uriTypes.test.ts +++ b/packages/connected-solid/test/uriTypes.test.ts @@ -1,4 +1,4 @@ -import { isSolidLeafUri } from "../src.js"; +import { isSolidLeafUri } from "../src/index.js"; describe("isLeafUri", () => { it("returns true if the given value is a leaf URI", () => { diff --git a/packages/connected/test/LinkTraversalIntegration.test.ts b/packages/connected/test/LinkTraversalIntegration.test.ts index 6d9ed2b..91a7eed 100644 --- a/packages/connected/test/LinkTraversalIntegration.test.ts +++ b/packages/connected/test/LinkTraversalIntegration.test.ts @@ -1,5 +1,5 @@ import type { ConnectedLdoDataset } from "../src/ConnectedLdoDataset.js"; -import { changeData, commitData, createConnectedLdoDataset } from "../src.js"; +import { changeData, commitData, createConnectedLdoDataset } from "../src/index.js"; import { solidConnectedPlugin, type SolidConnectedPlugin, diff --git a/packages/connected/test/mocks/MockResource.ts b/packages/connected/test/mocks/MockResource.ts index 4635593..4b4c378 100644 --- a/packages/connected/test/mocks/MockResource.ts +++ b/packages/connected/test/mocks/MockResource.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import EventEmitter from "events"; -import type { ResourceError } from "../../src.js"; -import type { ResourceError } from "../../src.js"; +import type { ResourceError } from "../../src/index.js"; +import type { ResourceError } from "../../src/index.js"; import type { DatasetChanges } from "@ldo/rdf-utils"; import type { ReadSuccess } from "../../src/results/success/ReadSuccess.js"; import type { UpdateSuccess } from "../../src/results/success/UpdateSuccess.js"; diff --git a/packages/dataset/example/extendedDatasetExample.ts b/packages/dataset/example/extendedDatasetExample.ts index 3c29ffc..dd4a5fb 100644 --- a/packages/dataset/example/extendedDatasetExample.ts +++ b/packages/dataset/example/extendedDatasetExample.ts @@ -1,7 +1,7 @@ -import { createDataset } from "../src.js"; +import { createDataset } from "../src/index.js"; // Required for advanced features: import { dataset as initializeDatasetCore } from "@rdfjs/dataset"; -import { ExtendedDatasetFactory } from "../src.js"; +import { ExtendedDatasetFactory } from "../src/index.js"; import { quad, namedNode, literal } from "@rdfjs/data-model"; import type { Dataset, diff --git a/packages/dataset/example/loadDataExample.ts b/packages/dataset/example/loadDataExample.ts index f85bb4e..cdaea23 100644 --- a/packages/dataset/example/loadDataExample.ts +++ b/packages/dataset/example/loadDataExample.ts @@ -1,4 +1,4 @@ -import { serializedToDataset } from "../src.js"; +import { serializedToDataset } from "../src/index.js"; async function run(): Promise { // Create an ExtendedDataset using Turtle diff --git a/packages/jsonld-dataset-proxy/jest.config.cjs b/packages/jsonld-dataset-proxy/jest.config.cjs new file mode 100644 index 0000000..3ad2cee --- /dev/null +++ b/packages/jsonld-dataset-proxy/jest.config.cjs @@ -0,0 +1,14 @@ +/* eslint-disable @typescript-eslint/no-var-requires */ +// packages/dataset/jest.config.cjs +const sharedConfig = require("../../jest.config.js"); + +module.exports = { + ...sharedConfig, + rootDir: "./", // Sets context for this package + collectCoverageFrom: [ + "src/**/*.ts", + "!src/**/*.d.ts", + // "!src/index.ts", // Optional, if index.ts only re-exports + ], + modulePathIgnorePatterns: ["/dist/"], +}; diff --git a/packages/jsonld-dataset-proxy/jest.config.js b/packages/jsonld-dataset-proxy/jest.config.js deleted file mode 100644 index bad5f64..0000000 --- a/packages/jsonld-dataset-proxy/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -// eslint-disable-next-line @typescript-eslint/no-var-requires -const sharedConfig = require("../../jest.config.js"); -module.exports = { - ...sharedConfig, - rootDir: "./", -}; diff --git a/packages/jsonld-dataset-proxy/package.json b/packages/jsonld-dataset-proxy/package.json index 5a7e822..4614c3f 100644 --- a/packages/jsonld-dataset-proxy/package.json +++ b/packages/jsonld-dataset-proxy/package.json @@ -2,11 +2,23 @@ "name": "@ldo/jsonld-dataset-proxy", "version": "1.0.0-alpha.9", "description": "", - "main": "dist/index.js", + "type": "module", + "main": "./dist/cjs/index.js", + "module": "./dist/esm/index.js", + "types": "./dist/types/index.d.ts", + "exports": { + ".": { + "types": "./dist/types/index.d.ts", + "import": "./dist/esm/index.js", + "require": "./dist/cjs/index.js" + }, + "./package.json": "./package.json" + }, "scripts": { - "build": "tsc --project tsconfig.build.json", - "build:watch": "tsc-watch", - "test": "NODE_NO_WARNINGS=1 jest --coverage", + "build": "rimraf dist && npm run build:cjs && npm run build:esm", + "build:cjs": "tsc --project tsconfig.cjs.json", + "build:esm": "tsc --project tsconfig.esm.json", + "test": "jest --coverage", "prepublishOnly": "npm run test && npm run build", "start": "ts-node ./example/example.ts", "start:lang": "ts-node ./example/languageExample.ts", diff --git a/packages/jsonld-dataset-proxy/test/BasicLdSet.test.ts b/packages/jsonld-dataset-proxy/test/BasicLdSet.test.ts index b750275..49cee5c 100644 --- a/packages/jsonld-dataset-proxy/test/BasicLdSet.test.ts +++ b/packages/jsonld-dataset-proxy/test/BasicLdSet.test.ts @@ -1,5 +1,5 @@ import { namedNode } from "@rdfjs/data-model"; -import jsonldDatasetProxy, { BasicLdSet, _getUnderlyingNode } from "../src.js"; +import jsonldDatasetProxy, { BasicLdSet, _getUnderlyingNode } from "../src/index.js"; import { createDataset } from "@ldo/dataset"; describe("BasicLdSet", () => { diff --git a/packages/jsonld-dataset-proxy/test/isProxy.test.ts b/packages/jsonld-dataset-proxy/test/isProxy.test.ts index aaaefea..048fe48 100644 --- a/packages/jsonld-dataset-proxy/test/isProxy.test.ts +++ b/packages/jsonld-dataset-proxy/test/isProxy.test.ts @@ -3,7 +3,7 @@ import { getSubjectProxyFromObject, isSetProxy, isSubjectProxy, -} from "../src.js"; +} from "../src/index.js"; describe("isSubjectProxy", () => { it("returns false if undefined is passed as a parameter", () => { diff --git a/packages/jsonld-dataset-proxy/test/jsonldDatasetProxy.test.ts b/packages/jsonld-dataset-proxy/test/jsonldDatasetProxy.test.ts index 036fb6a..60de3da 100644 --- a/packages/jsonld-dataset-proxy/test/jsonldDatasetProxy.test.ts +++ b/packages/jsonld-dataset-proxy/test/jsonldDatasetProxy.test.ts @@ -1,5 +1,5 @@ import { createDataset, serializedToDataset } from "@ldo/dataset"; -import type { JsonldDatasetProxyBuilder, LanguageSet, LdSet } from "../src.js"; +import type { JsonldDatasetProxyBuilder, LanguageSet, LdSet } from "../src/index.js"; import { graphOf, jsonldDatasetProxy, @@ -14,7 +14,7 @@ import { _writeGraphs, set, SetProxy, -} from "../src.js"; +} from "../src/index.js"; import type { ObservationShape, PatientShape } from "./patientExampleData.js"; import { patientData, diff --git a/packages/jsonld-dataset-proxy/test/nodeToJsonRepresentation.test.ts b/packages/jsonld-dataset-proxy/test/nodeToJsonRepresentation.test.ts index 399ca35..d43a0a0 100644 --- a/packages/jsonld-dataset-proxy/test/nodeToJsonRepresentation.test.ts +++ b/packages/jsonld-dataset-proxy/test/nodeToJsonRepresentation.test.ts @@ -2,7 +2,7 @@ import { createDataset } from "@ldo/dataset"; import { ContextUtil } from "../src/ContextUtil.js"; import { nodeToJsonldRepresentation } from "../src/util/nodeToJsonldRepresentation.js"; import { literal, defaultGraph } from "@rdfjs/data-model"; -import { ProxyContext } from "../src.js"; +import { ProxyContext } from "../src/index.js"; describe("objectToJsonRepresentation", () => { const extraParams: ProxyContext = new ProxyContext({ diff --git a/packages/jsonld-dataset-proxy/test/nodeToString.test.ts b/packages/jsonld-dataset-proxy/test/nodeToString.test.ts index ae98fac..e09cea2 100644 --- a/packages/jsonld-dataset-proxy/test/nodeToString.test.ts +++ b/packages/jsonld-dataset-proxy/test/nodeToString.test.ts @@ -1,5 +1,5 @@ import { blankNode, defaultGraph, literal, namedNode } from "@rdfjs/data-model"; -import { nodeToString } from "../src.js"; +import { nodeToString } from "../src/index.js"; describe("nodeToString", () => { it("returns all the correct values for nodeToString", () => { diff --git a/packages/jsonld-dataset-proxy/test/patientExampleData.ts b/packages/jsonld-dataset-proxy/test/patientExampleData.ts index 273008d..b48caf1 100644 --- a/packages/jsonld-dataset-proxy/test/patientExampleData.ts +++ b/packages/jsonld-dataset-proxy/test/patientExampleData.ts @@ -1,7 +1,7 @@ import type { ContextDefinition } from "jsonld"; import type { Schema } from "shexj"; import type { LdoJsonldContext } from "../src/LdoJsonldContext.js"; -import type { LdSet } from "../src.js"; +import type { LdSet } from "../src/index.js"; export interface ObservationShape { "@id"?: string; diff --git a/packages/jsonld-dataset-proxy/tsconfig.build.json b/packages/jsonld-dataset-proxy/tsconfig.build.json deleted file mode 100644 index 4bd5a5e..0000000 --- a/packages/jsonld-dataset-proxy/tsconfig.build.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "outDir": "./dist", - }, - "include": ["./src"] -} \ No newline at end of file diff --git a/packages/jsonld-dataset-proxy/tsconfig.cjs.json b/packages/jsonld-dataset-proxy/tsconfig.cjs.json new file mode 100644 index 0000000..affce40 --- /dev/null +++ b/packages/jsonld-dataset-proxy/tsconfig.cjs.json @@ -0,0 +1,10 @@ +{ + "extends": "../../tsconfig.cjs.json", + "compilerOptions": { + "outDir": "./dist/cjs", + "rootDir": "./src" + }, + "include": [ + "src" + ] +} \ No newline at end of file diff --git a/packages/jsonld-dataset-proxy/tsconfig.esm.json b/packages/jsonld-dataset-proxy/tsconfig.esm.json new file mode 100644 index 0000000..09f99c2 --- /dev/null +++ b/packages/jsonld-dataset-proxy/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.esm.json", + "compilerOptions": { + "outDir": "./dist/esm", + "rootDir": "./src", + "declarationDir": "./dist/types" + }, + "include": [ + "src" + ] +} \ No newline at end of file diff --git a/packages/ldo/test/LdoDataset.test.ts b/packages/ldo/test/LdoDataset.test.ts index c20c6a4..a2bae47 100644 --- a/packages/ldo/test/LdoDataset.test.ts +++ b/packages/ldo/test/LdoDataset.test.ts @@ -2,8 +2,8 @@ import { literal, namedNode, quad } from "@rdfjs/data-model"; import { createDataset } from "@ldo/dataset"; import type { SolidProfileShape } from "./profileData.js"; import { ProfileShapeType } from "./profileData.js"; -import type { LdoBuilder, LdoDataset } from "../src.js"; -import { createLdoDataset, graphOf, parseRdf, toTurtle, set } from "../src.js"; +import type { LdoBuilder, LdoDataset } from "../src/index.js"; +import { createLdoDataset, graphOf, parseRdf, toTurtle, set } from "../src/index.js"; import { sampleJsonld, sampleTurtle } from "./sampleData.js"; import type { SubjectProxy } from "@ldo/jsonld-dataset-proxy"; import { _proxyContext } from "@ldo/jsonld-dataset-proxy"; diff --git a/packages/ldo/test/methods.test.ts b/packages/ldo/test/methods.test.ts index 3468bf1..9d5ef98 100644 --- a/packages/ldo/test/methods.test.ts +++ b/packages/ldo/test/methods.test.ts @@ -23,7 +23,7 @@ import { write, setLanguagePreferences, languagesOf, -} from "../src.js"; +} from "../src/index.js"; import type { ILdoDataset } from "../src/types.js"; describe("methods", () => { diff --git a/packages/ldo/test/profileData.ts b/packages/ldo/test/profileData.ts index 1e4e53f..743143b 100644 --- a/packages/ldo/test/profileData.ts +++ b/packages/ldo/test/profileData.ts @@ -1,6 +1,6 @@ import type { Schema } from "shexj"; import type { ContextDefinition } from "jsonld"; -import type { LdSet, ShapeType } from "../src.js"; +import type { LdSet, ShapeType } from "../src/index.js"; export const profileShex: Schema = { type: "Schema", diff --git a/packages/solid-react/test/Solid-Integration.test.tsx b/packages/solid-react/test/Solid-Integration.test.tsx index c781816..9f60a98 100644 --- a/packages/solid-react/test/Solid-Integration.test.tsx +++ b/packages/solid-react/test/Solid-Integration.test.tsx @@ -21,7 +21,7 @@ import { useSubject, useSubscribeToResource, useLinkQuery, -} from "../src.js"; +} from "../src/index.js"; import { PostShShapeType } from "./.ldo/post.shapeTypes.js"; import type { PostSh } from "./.ldo/post.typings.js"; import { SolidProfileShapeShapeType } from "./.ldo/solidProfile.shapeTypes.js"; diff --git a/packages/subscribable-dataset/example/subscribableDatasetExample.ts b/packages/subscribable-dataset/example/subscribableDatasetExample.ts index 32653e4..17c7307 100644 --- a/packages/subscribable-dataset/example/subscribableDatasetExample.ts +++ b/packages/subscribable-dataset/example/subscribableDatasetExample.ts @@ -1,4 +1,4 @@ -import { createSubscribableDataset } from "../src.js"; +import { createSubscribableDataset } from "../src/index.js"; import { quad, namedNode, literal } from "@rdfjs/data-model"; import type { DatasetChanges } from "@ldo/rdf-utils"; diff --git a/packages/subscribable-dataset/test/SubscribableDataset.test.ts b/packages/subscribable-dataset/test/SubscribableDataset.test.ts index fcf0bbf..ae03011 100644 --- a/packages/subscribable-dataset/test/SubscribableDataset.test.ts +++ b/packages/subscribable-dataset/test/SubscribableDataset.test.ts @@ -9,6 +9,8 @@ import { blankNode, } from "@rdfjs/data-model"; import type { Quad, BlankNode } from "@rdfjs/types"; +// eslint-disable-next-line @typescript-eslint/ban-ts-comment +// @ts-ignore import testDataset from "@ldo/dataset/test/dataset.testHelper"; describe("SubscribableDataset", () => { diff --git a/packages/subscribable-dataset/test/createSubscribableDatasetFromSerializedInput.test.ts b/packages/subscribable-dataset/test/createSubscribableDatasetFromSerializedInput.test.ts index 2f8706e..cc8e3cb 100644 --- a/packages/subscribable-dataset/test/createSubscribableDatasetFromSerializedInput.test.ts +++ b/packages/subscribable-dataset/test/createSubscribableDatasetFromSerializedInput.test.ts @@ -1,4 +1,6 @@ import { serializedToSubscribableDataset } from "../src/index.js"; +// eslint-disable-next-line @typescript-eslint/ban-ts-comment +// @ts-ignore import { turtleData, jsonLdData } from "@ldo/dataset/test/sampleData"; describe("createExtendedDatasetFromSerializedInput", () => { diff --git a/packages/type-traverser/example/example.ts b/packages/type-traverser/example/example.ts index 3a98c0d..34bc899 100644 --- a/packages/type-traverser/example/example.ts +++ b/packages/type-traverser/example/example.ts @@ -2,8 +2,8 @@ import { type ValidateTraverserTypes, type TraverserDefinitions, Traverser, -} from "../src.js"; -import type { ParentIdentifiers } from "../src.js"; +} from "../src/index.js"; +import type { ParentIdentifiers } from "../src/index.js"; async function run() { /**