@synchronized-console/shared 2.25.7 → 2.31.14

package/dist/commonjs/viewer/helpers/state.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatSerializedViewerState = exports.isSerializedViewerState = exports.SERIALIZED_VIEWER_STATE_VERSION = void 0;
+exports.isVersionedSerializedViewerState = exports.inputToVersionedState = exports.formatSerializedViewerState = exports.isSerializedViewerState = exports.SERIALIZED_VIEWER_STATE_VERSION = exports.defaultMeasurementOptions = exports.MeasurementType = exports.defaultViewModeEdgeColorValue = void 0;
 const _lodash_1 = require("#lodash");
 const index_js_1 = require("../errors/index.js");
 const index_js_2 = require("../../core/index.js");
+exports.defaultViewModeEdgeColorValue = 'DEFAULT_EDGE_COLOR';
 /** Redefining these is unfortunate. Especially since they are not part of viewer-core */
 var MeasurementType;
 (function (MeasurementType) {
@@ -11,7 +12,14 @@ var MeasurementType;
     MeasurementType[MeasurementType["POINTTOPOINT"] = 1] = "POINTTOPOINT";
     MeasurementType[MeasurementType["AREA"] = 2] = "AREA";
     MeasurementType[MeasurementType["POINT"] = 3] = "POINT";
-})(MeasurementType || (MeasurementType = {}));
+})(MeasurementType || (exports.MeasurementType = MeasurementType = {}));
+exports.defaultMeasurementOptions = Object.freeze({
+    visible: true,
+    type: MeasurementType.POINTTOPOINT,
+    vertexSnap: false,
+    units: 'm',
+    precision: 2
+});
 /**
  * v1 -> v1.1
  * - ui.filters.propertyFilter.isApplied field added
@@ -20,8 +28,21 @@ var MeasurementType;
  * - ui.diff added
  * v1.2 -> v1.3
  * - ui.filters.selectedObjectIds removed in favor of ui.filters.selectedObjectApplicationIds
+ * v1.3 -> 1.4
+ * - ui.viewMode -> ui.viewMode.mode
+ * - ui.viewMode has new keys: edgesEnabled, edgesWeight, outlineOpacity, edgesColor
+ * v1.4 -> 1.5
+ * - ui.measurement.measurements added
+ * v1.5 -> 1.6
+ * - ui.filters.propertyFilter -> propertyFilters
+ * - activeColorFilterId added
+ * v1.6 -> 1.7
+ * - ui.filters.filterLogic added
+ * - ui.filters.propertyFilters.condition updated
+ * v1.7 -> 1.8
+ * - ui.filters.propertyFilters.numericRange added
  */
-exports.SERIALIZED_VIEWER_STATE_VERSION = 1.3;
+exports.SERIALIZED_VIEWER_STATE_VERSION = 1.8;
 /**
  * Note: This only does superficial validation. To really ensure that all of the keys are there, even if prefilled with default values, make sure you invoke
  * formatSerializedViewerState() on the state afterwards
@@ -48,15 +69,8 @@ const initializeMissingData = (state) => {
     const throwInvalidError = (missingPath) => {
         throw new index_js_1.UnformattableSerializedViewerStateError('Required data missing from SerializedViewerState: ' + missingPath);
     };
-    const defaultMeasurementOptions = {
-        visible: false,
-        type: MeasurementType.POINTTOPOINT,
-        vertexSnap: false,
-        units: 'm',
-        precision: 2
-    };
     const measurementOptions = {
-        ...defaultMeasurementOptions,
+        ...exports.defaultMeasurementOptions,
         ...state.ui?.measurement?.options
     };
     const selectedObjectApplicationIds = {
@@ -68,6 +82,10 @@ const initializeMissingData = (state) => {
         // Sanitize incoming object
         ...(0, index_js_2.coerceUndefinedValuesToNull)(state.ui?.filters?.selectedObjectApplicationIds || {})
     };
+    const viewModeType = (0, _lodash_1.isNumber)(state.ui?.viewMode)
+        ? state.ui.viewMode
+        : state.ui?.viewMode?.mode;
+    const viewModeSettings = (0, _lodash_1.isNumber)(state.ui?.viewMode) ? {} : state.ui?.viewMode;
     return {
         projectId: state.projectId || throwInvalidError('projectId'),
         sessionId: state.sessionId || `nullSessionId-${Math.random() * 1000}`,
@@ -109,17 +127,48 @@ const initializeMissingData = (state) => {
                 mode: state.ui?.diff?.mode || 1
             },
             spotlightUserSessionId: state.ui?.spotlightUserSessionId || null,
-            filters: {
-                ...(state.ui?.filters || {}),
-                isolatedObjectIds: state.ui?.filters?.isolatedObjectIds || [],
-                hiddenObjectIds: state.ui?.filters?.hiddenObjectIds || [],
-                selectedObjectApplicationIds,
-                propertyFilter: {
-                    ...(state.ui?.filters?.propertyFilter || {}),
-                    key: state.ui?.filters?.propertyFilter?.key || null,
-                    isApplied: state.ui?.filters?.propertyFilter?.isApplied || false
+            filters: (() => {
+                const baseFilters = {
+                    ...(state.ui?.filters || {}),
+                    isolatedObjectIds: state.ui?.filters?.isolatedObjectIds || [],
+                    hiddenObjectIds: state.ui?.filters?.hiddenObjectIds || [],
+                    selectedObjectApplicationIds,
+                    activeColorFilterId: state.ui?.filters?.activeColorFilterId || null
+                };
+                // Migration logic: handle legacy propertyFilter and new propertyFilters
+                let propertyFilters = [];
+                // If new propertyFilters exist and are not empty, use them
+                if (state.ui?.filters?.propertyFilters &&
+                    Array.isArray(state.ui.filters.propertyFilters) &&
+                    state.ui.filters.propertyFilters.length > 0) {
+                    // Map legacy condition values to new format
+                    propertyFilters = state.ui.filters.propertyFilters.map((filter) => ({
+                        ...filter,
+                        condition: filter.condition === 'AND'
+                            ? 'is'
+                            : filter.condition === 'OR'
+                                ? 'is'
+                                : filter.condition
+                    }));
                 }
-            },
+                // If legacy propertyFilter exists but no propertyFilters (or empty propertyFilters), migrate it
+                else if (state.ui?.filters?.propertyFilter?.key) {
+                    propertyFilters = [
+                        {
+                            key: state.ui.filters.propertyFilter.key,
+                            isApplied: state.ui.filters.propertyFilter.isApplied || false,
+                            selectedValues: [], // Legacy didn't have selectedValues
+                            id: 'legacy-filter', // Generate a consistent ID for legacy filter
+                            condition: 'is'
+                        }
+                    ];
+                }
+                return {
+                    ...baseFilters,
+                    propertyFilters,
+                    filterLogic: state.ui?.filters?.filterLogic || 'all'
+                };
+            })(),
             camera: {
                 ...(state.ui?.camera || {}),
                 position: state.ui?.camera?.position || throwInvalidError('ui.camera.position'),
@@ -127,7 +176,13 @@ const initializeMissingData = (state) => {
                 isOrthoProjection: state.ui?.camera?.isOrthoProjection || false,
                 zoom: state.ui?.camera?.zoom || 1
             },
-            viewMode: state.ui?.viewMode || 0,
+            viewMode: {
+                mode: viewModeType ?? 0,
+                edgesEnabled: viewModeSettings?.edgesEnabled ?? true,
+                edgesWeight: viewModeSettings?.edgesWeight ?? 1,
+                outlineOpacity: viewModeSettings?.outlineOpacity ?? 0.75,
+                edgesColor: viewModeSettings?.edgesColor ?? exports.defaultViewModeEdgeColorValue
+            },
             sectionBox: state.ui?.sectionBox?.min?.length && state.ui?.sectionBox.max?.length
                 ? // Complains otherwise
                     state.ui.sectionBox
@@ -143,7 +198,8 @@ const initializeMissingData = (state) => {
             selection: state.ui?.selection || null,
             measurement: {
                 enabled: state.ui?.measurement?.enabled ?? false,
-                options: measurementOptions
+                options: measurementOptions,
+                measurements: state.ui?.measurement?.measurements || []
             }
         }
     };
@@ -157,4 +213,25 @@ const formatSerializedViewerState = (state) => {
     return finalState;
 };
 exports.formatSerializedViewerState = formatSerializedViewerState;
+const inputToVersionedState = (inputSerializedViewerState) => {
+    const state = (0, exports.isSerializedViewerState)(inputSerializedViewerState)
+        ? (0, exports.formatSerializedViewerState)(inputSerializedViewerState)
+        : null;
+    if (!state)
+        return null;
+    return {
+        version: exports.SERIALIZED_VIEWER_STATE_VERSION,
+        state
+    };
+};
+exports.inputToVersionedState = inputToVersionedState;
+const isVersionedSerializedViewerState = (data) => {
+    if (!data || !(0, _lodash_1.isObjectLike)(data))
+        return false;
+    if (!(0, _lodash_1.has)(data, 'version'))
+        return false;
+    const stateRaw = data.state;
+    return (0, exports.isSerializedViewerState)(stateRaw);
+};
+exports.isVersionedSerializedViewerState = isVersionedSerializedViewerState;
 //# sourceMappingURL=state.js.map

package/dist/commonjs/viewer/helpers/state.js.map

@@ -1 +1 @@
-{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../src/viewer/helpers/state.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../src/viewer/helpers/state.ts"],"names":[],"mappings":"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"}

package/dist/commonjs/workers/fileimport/job.d.ts

@@ -1,6 +1,5 @@
 import z from 'zod';
-export declare const jobPayload: z.ZodObject<{
-    jobId: z.ZodString;
+export declare const jobPayloadV1: z.ZodObject<{
     serverUrl: z.ZodString;
     projectId: z.ZodString;
     modelId: z.ZodString;
@@ -12,7 +11,6 @@ export declare const jobPayload: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     modelId: string;
     projectId: string;
-    jobId: string;
     serverUrl: string;
     token: string;
     blobId: string;
@@ -22,7 +20,6 @@ export declare const jobPayload: z.ZodObject<{
 }, {
     modelId: string;
     projectId: string;
-    jobId: string;
     serverUrl: string;
     token: string;
     blobId: string;
@@ -30,27 +27,50 @@ export declare const jobPayload: z.ZodObject<{
     fileName: string;
     timeOutSeconds?: number | undefined;
 }>;
-export type JobPayload = z.infer<typeof jobPayload>;
+export type JobPayloadV1 = z.infer<typeof jobPayloadV1>;
 declare const baseFileImportResult: z.ZodObject<{
     durationSeconds: z.ZodNumber;
+    downloadDurationSeconds: z.ZodNumber;
+    parseDurationSeconds: z.ZodNumber;
+    parser: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     durationSeconds: number;
+    downloadDurationSeconds: number;
+    parseDurationSeconds: number;
+    parser: string;
 }, {
     durationSeconds: number;
+    downloadDurationSeconds: number;
+    parseDurationSeconds: number;
+    parser: string;
 }>;
+export declare const JobResultStatus: {
+    readonly Error: "error";
+    readonly Success: "success";
+};
 export type FileImportResult = z.infer<typeof baseFileImportResult>;
 declare const fileImportSuccessPayload: z.ZodObject<{
     status: z.ZodLiteral<"success">;
     warnings: z.ZodArray<z.ZodString, "many">;
-    result: z.ZodObject<{
+    result: z.ZodObject<z.objectUtil.extendShape<{
         durationSeconds: z.ZodNumber;
+        downloadDurationSeconds: z.ZodNumber;
+        parseDurationSeconds: z.ZodNumber;
+        parser: z.ZodString;
+    }, {
         versionId: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
+    }>, "strip", z.ZodTypeAny, {
         versionId: string;
         durationSeconds: number;
+        downloadDurationSeconds: number;
+        parseDurationSeconds: number;
+        parser: string;
     }, {
         versionId: string;
         durationSeconds: number;
+        downloadDurationSeconds: number;
+        parseDurationSeconds: number;
+        parser: string;
     }>;
 }, "strip", z.ZodTypeAny, {
     status: "success";
@@ -58,6 +78,9 @@ declare const fileImportSuccessPayload: z.ZodObject<{
     result: {
         versionId: string;
         durationSeconds: number;
+        downloadDurationSeconds: number;
+        parseDurationSeconds: number;
+        parser: string;
     };
 }, {
     status: "success";
@@ -65,6 +88,9 @@ declare const fileImportSuccessPayload: z.ZodObject<{
     result: {
         versionId: string;
         durationSeconds: number;
+        downloadDurationSeconds: number;
+        parseDurationSeconds: number;
+        parser: string;
     };
 }>;
 export type FileImportSuccessPayload = z.infer<typeof fileImportSuccessPayload>;
@@ -73,21 +99,36 @@ declare const fileImportErrorPayload: z.ZodObject<{
     reason: z.ZodString;
     result: z.ZodObject<{
         durationSeconds: z.ZodNumber;
+        downloadDurationSeconds: z.ZodNumber;
+        parseDurationSeconds: z.ZodNumber;
+        parser: z.ZodString;
     }, "strip", z.ZodTypeAny, {
         durationSeconds: number;
+        downloadDurationSeconds: number;
+        parseDurationSeconds: number;
+        parser: string;
     }, {
         durationSeconds: number;
+        downloadDurationSeconds: number;
+        parseDurationSeconds: number;
+        parser: string;
     }>;
 }, "strip", z.ZodTypeAny, {
     status: "error";
     result: {
         durationSeconds: number;
+        downloadDurationSeconds: number;
+        parseDurationSeconds: number;
+        parser: string;
     };
     reason: string;
 }, {
     status: "error";
     result: {
         durationSeconds: number;
+        downloadDurationSeconds: number;
+        parseDurationSeconds: number;
+        parser: string;
     };
     reason: string;
 }>;
@@ -95,15 +136,25 @@ export type FileImportErrorPayload = z.infer<typeof fileImportErrorPayload>;
 export declare const fileImportResultPayload: z.ZodDiscriminatedUnion<"status", [z.ZodObject<{
     status: z.ZodLiteral<"success">;
     warnings: z.ZodArray<z.ZodString, "many">;
-    result: z.ZodObject<{
+    result: z.ZodObject<z.objectUtil.extendShape<{
         durationSeconds: z.ZodNumber;
+        downloadDurationSeconds: z.ZodNumber;
+        parseDurationSeconds: z.ZodNumber;
+        parser: z.ZodString;
+    }, {
         versionId: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
+    }>, "strip", z.ZodTypeAny, {
         versionId: string;
         durationSeconds: number;
+        downloadDurationSeconds: number;
+        parseDurationSeconds: number;
+        parser: string;
     }, {
         versionId: string;
         durationSeconds: number;
+        downloadDurationSeconds: number;
+        parseDurationSeconds: number;
+        parser: string;
     }>;
 }, "strip", z.ZodTypeAny, {
     status: "success";
@@ -111,6 +162,9 @@ export declare const fileImportResultPayload: z.ZodDiscriminatedUnion<"status",
     result: {
         versionId: string;
         durationSeconds: number;
+        downloadDurationSeconds: number;
+        parseDurationSeconds: number;
+        parser: string;
     };
 }, {
     status: "success";
@@ -118,30 +172,52 @@ export declare const fileImportResultPayload: z.ZodDiscriminatedUnion<"status",
     result: {
         versionId: string;
         durationSeconds: number;
+        downloadDurationSeconds: number;
+        parseDurationSeconds: number;
+        parser: string;
     };
 }>, z.ZodObject<{
     status: z.ZodLiteral<"error">;
     reason: z.ZodString;
     result: z.ZodObject<{
         durationSeconds: z.ZodNumber;
+        downloadDurationSeconds: z.ZodNumber;
+        parseDurationSeconds: z.ZodNumber;
+        parser: z.ZodString;
     }, "strip", z.ZodTypeAny, {
         durationSeconds: number;
+        downloadDurationSeconds: number;
+        parseDurationSeconds: number;
+        parser: string;
     }, {
         durationSeconds: number;
+        downloadDurationSeconds: number;
+        parseDurationSeconds: number;
+        parser: string;
     }>;
 }, "strip", z.ZodTypeAny, {
     status: "error";
     result: {
         durationSeconds: number;
+        downloadDurationSeconds: number;
+        parseDurationSeconds: number;
+        parser: string;
     };
     reason: string;
 }, {
     status: "error";
     result: {
         durationSeconds: number;
+        downloadDurationSeconds: number;
+        parseDurationSeconds: number;
+        parser: string;
     };
     reason: string;
 }>]>;
 export type FileImportResultPayload = z.infer<typeof fileImportResultPayload>;
+export type FileImportJobPayloadV1 = JobPayloadV1 & {
+    jobType: 'fileImport';
+    payloadVersion: 1;
+};
 export {};
 //# sourceMappingURL=job.d.ts.map

package/dist/commonjs/workers/fileimport/job.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"job.d.ts","sourceRoot":"","sources":["../../../../src/workers/fileimport/job.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAA;AAOnB,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EActB,CAAA;AACD,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC,CAAA;AAEnD,QAAA,MAAM,oBAAoB;;;;;;EAExB,CAAA;AAEF,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAA;AAEnE,QAAA,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;EAI5B,CAAA;AAEF,MAAM,MAAM,wBAAwB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAA;AAE/E,QAAA,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;EAI1B,CAAA;AAEF,MAAM,MAAM,sBAAsB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAA;AAE3E,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAGlC,CAAA;AAEF,MAAM,MAAM,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAA"}
+{"version":3,"file":"job.d.ts","sourceRoot":"","sources":["../../../../src/workers/fileimport/job.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAA;AAGnB,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;EAavB,CAAA;AAEF,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAA;AAEvD,QAAA,MAAM,oBAAoB;;;;;;;;;;;;;;;EAexB,CAAA;AAEF,eAAO,MAAM,eAAe;;;CAGlB,CAAA;AAEV,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAA;AAEnE,QAAA,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAI5B,CAAA;AAEF,MAAM,MAAM,wBAAwB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAA;AAE/E,QAAA,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAI1B,CAAA;AAEF,MAAM,MAAM,sBAAsB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAA;AAE3E,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAGlC,CAAA;AAEF,MAAM,MAAM,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAA;AAE7E,MAAM,MAAM,sBAAsB,GAAG,YAAY,GAAG;IAClD,OAAO,EAAE,YAAY,CAAA;IACrB,cAAc,EAAE,CAAC,CAAA;CAClB,CAAA"}

package/dist/commonjs/workers/fileimport/job.js

@@ -3,13 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fileImportResultPayload = exports.jobPayload = void 0;
+exports.fileImportResultPayload = exports.JobResultStatus = exports.jobPayloadV1 = void 0;
 const zod_1 = __importDefault(require("zod"));
 const index_js_1 = require("../../core/index.js");
-const job = zod_1.default.object({
-    jobId: zod_1.default.string()
-});
-exports.jobPayload = job.merge(zod_1.default.object({
+exports.jobPayloadV1 = zod_1.default.object({
     serverUrl: zod_1.default.string().url().describe('The url of the server'),
     projectId: zod_1.default.string(),
     modelId: zod_1.default.string(),
@@ -20,18 +17,32 @@ exports.jobPayload = job.merge(zod_1.default.object({
     timeOutSeconds: zod_1.default
         .number()
         .int()
-        .default(20 * index_js_1.TIME.minute)
-}));
+        .default(30 * index_js_1.TIME.minute)
+        .describe('The timeout for a single attempt of the job, in seconds.')
+});
 const baseFileImportResult = zod_1.default.object({
-    durationSeconds: zod_1.default.number().describe('Duration to import the file, in seconds')
+    durationSeconds: zod_1.default
+        .number()
+        .describe('Total duration to download & import the file, in seconds'),
+    downloadDurationSeconds: zod_1.default
+        .number()
+        .describe('Duration to download the file, in seconds. This is a sub-component of the total duration.'),
+    parseDurationSeconds: zod_1.default
+        .number()
+        .describe('Duration to parse the file, in seconds. This is a sub-component of the total duration.'),
+    parser: zod_1.default.string().describe('The parser used for the import')
 });
+exports.JobResultStatus = {
+    Error: 'error',
+    Success: 'success'
+};
 const fileImportSuccessPayload = zod_1.default.object({
-    status: zod_1.default.literal('success'),
+    status: zod_1.default.literal(exports.JobResultStatus.Success),
     warnings: zod_1.default.array(zod_1.default.string()), //ok to be empty
     result: baseFileImportResult.merge(zod_1.default.object({ versionId: zod_1.default.string() }))
 });
 const fileImportErrorPayload = zod_1.default.object({
-    status: zod_1.default.literal('error'),
+    status: zod_1.default.literal(exports.JobResultStatus.Error),
     reason: zod_1.default.string(),
     result: baseFileImportResult
 });

package/dist/commonjs/workers/fileimport/job.js.map

@@ -1 +1 @@
-{"version":3,"file":"job.js","sourceRoot":"","sources":["../../../../src/workers/fileimport/job.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAmB;AACnB,kDAA0C;AAE1C,MAAM,GAAG,GAAG,aAAC,CAAC,MAAM,CAAC;IACnB,KAAK,EAAE,aAAC,CAAC,MAAM,EAAE;CAClB,CAAC,CAAA;AAEW,QAAA,UAAU,GAAG,GAAG,CAAC,KAAK,CACjC,aAAC,CAAC,MAAM,CAAC;IACP,SAAS,EAAE,aAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,uBAAuB,CAAC;IAC7D,SAAS,EAAE,aAAC,CAAC,MAAM,EAAE;IACrB,OAAO,EAAE,aAAC,CAAC,MAAM,EAAE;IACnB,KAAK,EAAE,aAAC,CAAC,MAAM,EAAE;IACjB,MAAM,EAAE,aAAC,CAAC,MAAM,EAAE;IAClB,QAAQ,EAAE,aAAC,CAAC,MAAM,EAAE;IACpB,QAAQ,EAAE,aAAC,CAAC,MAAM,EAAE;IACpB,cAAc,EAAE,aAAC;SACd,MAAM,EAAE;SACR,GAAG,EAAE;SACL,OAAO,CAAC,EAAE,GAAG,eAAI,CAAC,MAAM,CAAC;CAC7B,CAAC,CACH,CAAA;AAGD,MAAM,oBAAoB,GAAG,aAAC,CAAC,MAAM,CAAC;IACpC,eAAe,EAAE,aAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,yCAAyC,CAAC;CAChF,CAAC,CAAA;AAIF,MAAM,wBAAwB,GAAG,aAAC,CAAC,MAAM,CAAC;IACxC,MAAM,EAAE,aAAC,CAAC,OAAO,CAAC,SAAS,CAAC;IAC5B,QAAQ,EAAE,aAAC,CAAC,KAAK,CAAC,aAAC,CAAC,MAAM,EAAE,CAAC,EAAE,gBAAgB;IAC/C,MAAM,EAAE,oBAAoB,CAAC,KAAK,CAAC,aAAC,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,aAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;CACxE,CAAC,CAAA;AAIF,MAAM,sBAAsB,GAAG,aAAC,CAAC,MAAM,CAAC;IACtC,MAAM,EAAE,aAAC,CAAC,OAAO,CAAC,OAAO,CAAC;IAC1B,MAAM,EAAE,aAAC,CAAC,MAAM,EAAE;IAClB,MAAM,EAAE,oBAAoB;CAC7B,CAAC,CAAA;AAIW,QAAA,uBAAuB,GAAG,aAAC,CAAC,kBAAkB,CAAC,QAAQ,EAAE;IACpE,wBAAwB;IACxB,sBAAsB;CACvB,CAAC,CAAA"}
+{"version":3,"file":"job.js","sourceRoot":"","sources":["../../../../src/workers/fileimport/job.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAmB;AACnB,kDAA0C;AAE7B,QAAA,YAAY,GAAG,aAAC,CAAC,MAAM,CAAC;IACnC,SAAS,EAAE,aAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,uBAAuB,CAAC;IAC7D,SAAS,EAAE,aAAC,CAAC,MAAM,EAAE;IACrB,OAAO,EAAE,aAAC,CAAC,MAAM,EAAE;IACnB,KAAK,EAAE,aAAC,CAAC,MAAM,EAAE;IACjB,MAAM,EAAE,aAAC,CAAC,MAAM,EAAE;IAClB,QAAQ,EAAE,aAAC,CAAC,MAAM,EAAE;IACpB,QAAQ,EAAE,aAAC,CAAC,MAAM,EAAE;IACpB,cAAc,EAAE,aAAC;SACd,MAAM,EAAE;SACR,GAAG,EAAE;SACL,OAAO,CAAC,EAAE,GAAG,eAAI,CAAC,MAAM,CAAC;SACzB,QAAQ,CAAC,0DAA0D,CAAC;CACxE,CAAC,CAAA;AAIF,MAAM,oBAAoB,GAAG,aAAC,CAAC,MAAM,CAAC;IACpC,eAAe,EAAE,aAAC;SACf,MAAM,EAAE;SACR,QAAQ,CAAC,0DAA0D,CAAC;IACvE,uBAAuB,EAAE,aAAC;SACvB,MAAM,EAAE;SACR,QAAQ,CACP,2FAA2F,CAC5F;IACH,oBAAoB,EAAE,aAAC;SACpB,MAAM,EAAE;SACR,QAAQ,CACP,wFAAwF,CACzF;IACH,MAAM,EAAE,aAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,gCAAgC,CAAC;CAC9D,CAAC,CAAA;AAEW,QAAA,eAAe,GAAG;IAC7B,KAAK,EAAE,OAAO;IACd,OAAO,EAAE,SAAS;CACV,CAAA;AAIV,MAAM,wBAAwB,GAAG,aAAC,CAAC,MAAM,CAAC;IACxC,MAAM,EAAE,aAAC,CAAC,OAAO,CAAC,uBAAe,CAAC,OAAO,CAAC;IAC1C,QAAQ,EAAE,aAAC,CAAC,KAAK,CAAC,aAAC,CAAC,MAAM,EAAE,CAAC,EAAE,gBAAgB;IAC/C,MAAM,EAAE,oBAAoB,CAAC,KAAK,CAAC,aAAC,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,aAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;CACxE,CAAC,CAAA;AAIF,MAAM,sBAAsB,GAAG,aAAC,CAAC,MAAM,CAAC;IACtC,MAAM,EAAE,aAAC,CAAC,OAAO,CAAC,uBAAe,CAAC,KAAK,CAAC;IACxC,MAAM,EAAE,aAAC,CAAC,MAAM,EAAE;IAClB,MAAM,EAAE,oBAAoB;CAC7B,CAAC,CAAA;AAIW,QAAA,uBAAuB,GAAG,aAAC,CAAC,kBAAkB,CAAC,QAAQ,EAAE;IACpE,wBAAwB;IACxB,sBAAsB;CACvB,CAAC,CAAA"}

package/dist/commonjs/workers/previews/job.d.ts

@@ -1,10 +1,20 @@
 import z from 'zod';
-export declare const jobPayload: z.ZodObject<{
-    jobId: z.ZodString;
+export declare const jobIdSchema: z.ZodEffects<z.ZodString, string, string>;
+export declare const toJobId: (params: {
+    projectId: string;
+    objectId: string;
+}) => string;
+export declare const fromJobId: (jobId: string) => {
+    projectId: string;
+    objectId: string;
+};
+export declare const jobPayload: z.ZodObject<z.objectUtil.extendShape<{
+    jobId: z.ZodEffects<z.ZodString, string, string>;
+}, {
     url: z.ZodString;
     token: z.ZodString;
     responseQueue: z.ZodString;
-}, "strip", z.ZodTypeAny, {
+}>, "strip", z.ZodTypeAny, {
     jobId: string;
     token: string;
     url: string;
@@ -26,12 +36,13 @@ declare const previewPageResult: z.ZodObject<{
     durationSeconds: number;
     screenshots: Record<string, string>;
 }>;
-declare const previewJobResult: z.ZodObject<{
+declare const previewJobResult: z.ZodObject<z.objectUtil.extendShape<{
     durationSeconds: z.ZodNumber;
     screenshots: z.ZodRecord<z.ZodString, z.ZodString>;
+}, {
     loadDurationSeconds: z.ZodOptional<z.ZodNumber>;
     renderDurationSeconds: z.ZodOptional<z.ZodNumber>;
-}, "strip", z.ZodTypeAny, {
+}>, "strip", z.ZodTypeAny, {
     durationSeconds: number;
     screenshots: Record<string, string>;
     loadDurationSeconds?: number | undefined;
@@ -44,15 +55,17 @@ declare const previewJobResult: z.ZodObject<{
 }>;
 export type PreviewPageResult = z.infer<typeof previewPageResult>;
 export type PreviewJobResult = z.infer<typeof previewJobResult>;
-declare const previewSuccessPayload: z.ZodObject<{
-    jobId: z.ZodString;
+declare const previewSuccessPayload: z.ZodObject<z.objectUtil.extendShape<{
+    jobId: z.ZodEffects<z.ZodString, string, string>;
+}, {
     status: z.ZodLiteral<"success">;
-    result: z.ZodObject<{
+    result: z.ZodObject<z.objectUtil.extendShape<{
         durationSeconds: z.ZodNumber;
         screenshots: z.ZodRecord<z.ZodString, z.ZodString>;
+    }, {
         loadDurationSeconds: z.ZodOptional<z.ZodNumber>;
         renderDurationSeconds: z.ZodOptional<z.ZodNumber>;
-    }, "strip", z.ZodTypeAny, {
+    }>, "strip", z.ZodTypeAny, {
         durationSeconds: number;
         screenshots: Record<string, string>;
         loadDurationSeconds?: number | undefined;
@@ -63,7 +76,7 @@ declare const previewSuccessPayload: z.ZodObject<{
         loadDurationSeconds?: number | undefined;
         renderDurationSeconds?: number | undefined;
     }>;
-}, "strip", z.ZodTypeAny, {
+}>, "strip", z.ZodTypeAny, {
     status: "success";
     jobId: string;
     result: {
@@ -83,15 +96,17 @@ declare const previewSuccessPayload: z.ZodObject<{
     };
 }>;
 export type PreviewSuccessPayload = z.infer<typeof previewSuccessPayload>;
-export declare const previewResultPayload: z.ZodDiscriminatedUnion<"status", [z.ZodObject<{
-    jobId: z.ZodString;
+export declare const previewResultPayload: z.ZodDiscriminatedUnion<"status", [z.ZodObject<z.objectUtil.extendShape<{
+    jobId: z.ZodEffects<z.ZodString, string, string>;
+}, {
     status: z.ZodLiteral<"success">;
-    result: z.ZodObject<{
+    result: z.ZodObject<z.objectUtil.extendShape<{
         durationSeconds: z.ZodNumber;
         screenshots: z.ZodRecord<z.ZodString, z.ZodString>;
+    }, {
         loadDurationSeconds: z.ZodOptional<z.ZodNumber>;
         renderDurationSeconds: z.ZodOptional<z.ZodNumber>;
-    }, "strip", z.ZodTypeAny, {
+    }>, "strip", z.ZodTypeAny, {
         durationSeconds: number;
         screenshots: Record<string, string>;
         loadDurationSeconds?: number | undefined;
@@ -102,7 +117,7 @@ export declare const previewResultPayload: z.ZodDiscriminatedUnion<"status", [z.
         loadDurationSeconds?: number | undefined;
         renderDurationSeconds?: number | undefined;
     }>;
-}, "strip", z.ZodTypeAny, {
+}>, "strip", z.ZodTypeAny, {
     status: "success";
     jobId: string;
     result: {
@@ -120,15 +135,17 @@ export declare const previewResultPayload: z.ZodDiscriminatedUnion<"status", [z.
         loadDurationSeconds?: number | undefined;
         renderDurationSeconds?: number | undefined;
     };
-}>, z.ZodObject<{
-    jobId: z.ZodString;
+}>, z.ZodObject<z.objectUtil.extendShape<{
+    jobId: z.ZodEffects<z.ZodString, string, string>;
+}, {
     status: z.ZodLiteral<"error">;
     reason: z.ZodString;
-    result: z.ZodObject<{
+    result: z.ZodObject<z.objectUtil.extendShape<{
         durationSeconds: z.ZodNumber;
+    }, {
         loadDurationSeconds: z.ZodOptional<z.ZodNumber>;
         renderDurationSeconds: z.ZodOptional<z.ZodNumber>;
-    }, "strip", z.ZodTypeAny, {
+    }>, "strip", z.ZodTypeAny, {
         durationSeconds: number;
         loadDurationSeconds?: number | undefined;
         renderDurationSeconds?: number | undefined;
@@ -137,7 +154,7 @@ export declare const previewResultPayload: z.ZodDiscriminatedUnion<"status", [z.
         loadDurationSeconds?: number | undefined;
         renderDurationSeconds?: number | undefined;
     }>;
-}, "strip", z.ZodTypeAny, {
+}>, "strip", z.ZodTypeAny, {
     status: "error";
     jobId: string;
     result: {

package/dist/commonjs/workers/previews/job.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"job.d.ts","sourceRoot":"","sources":["../../../../src/workers/previews/job.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAA;AAMnB,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;EAMtB,CAAA;AACD,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC,CAAA;AAEnD,QAAA,MAAM,iBAAiB;;;;;;;;;EAGrB,CAAA;AAaF,QAAA,MAAM,gBAAgB;;;;;;;;;;;;;;;EAA0C,CAAA;AAEhE,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAA;AACjE,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAA;AAE/D,QAAA,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAK1B,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAA;AAgBzE,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAG/B,CAAA;AAEF,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAA"}
+{"version":3,"file":"job.d.ts","sourceRoot":"","sources":["../../../../src/workers/previews/job.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAA;AAInB,eAAO,MAAM,WAAW,2CAIpB,CAAA;AAEJ,eAAO,MAAM,OAAO,WAAY;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,KAAG,MAEzE,CAAA;AACD,eAAO,MAAM,SAAS,UAAW,MAAM,KAAG;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAS9E,CAAA;AAMD,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;EAMtB,CAAA;AACD,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC,CAAA;AAEnD,QAAA,MAAM,iBAAiB;;;;;;;;;EAGrB,CAAA;AAaF,QAAA,MAAM,gBAAgB;;;;;;;;;;;;;;;;EAA0C,CAAA;AAEhE,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAA;AACjE,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAA;AAE/D,QAAA,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAK1B,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAA;AAgBzE,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAG/B,CAAA;AAEF,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAA"}