@opencrvs/toolkit 1.8.0-rc.f7a451a → 1.8.0-rc.f7bcb31

package/dist/scopes/index.d.ts

@@ -123,84 +123,19 @@ declare const ConfigurableScopes: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
     options: {
         role: string[];
     };
-}>, z.ZodObject<{
-    type: z.ZodLiteral<"workqueue">;
-    options: z.ZodObject<{
-        id: z.ZodArray<z.ZodString, "many">;
-    }, "strip", z.ZodTypeAny, {
-        id: string[];
-    }, {
-        id: string[];
-    }>;
-}, "strip", z.ZodTypeAny, {
-    type: "workqueue";
-    options: {
-        id: string[];
-    };
-}, {
-    type: "workqueue";
-    options: {
-        id: string[];
-    };
-}>, z.ZodObject<{
-    type: z.ZodLiteral<"record.notify">;
-    options: z.ZodObject<{
-        event: z.ZodArray<z.ZodString, "many">;
-    }, "strip", z.ZodTypeAny, {
-        event: string[];
-    }, {
-        event: string[];
-    }>;
-}, "strip", z.ZodTypeAny, {
-    type: "record.notify";
-    options: {
-        event: string[];
-    };
-}, {
-    type: "record.notify";
-    options: {
-        event: string[];
-    };
 }>]>;
-export type ConfigurableScopeType = ConfigurableScopes['type'];
-export type ConfigurableScopes = z.infer<typeof ConfigurableScopes>;
-export declare function findScope<T extends ConfigurableScopeType>(scopes: string[], scopeType: T): Extract<{
+type ConfigurableScopes = z.infer<typeof ConfigurableScopes>;
+export declare function findScope(scopes: string[], scopeType: ConfigurableScopes['type']): {
     type: "user.create";
     options: {
         role: string[];
     };
-}, {
-    type: T;
-}> | Extract<{
+} | {
     type: "user.edit";
     options: {
         role: string[];
     };
-}, {
-    type: T;
-}> | Extract<{
-    type: "workqueue";
-    options: {
-        id: string[];
-    };
-}, {
-    type: T;
-}> | Extract<{
-    type: "record.notify";
-    options: {
-        event: string[];
-    };
-}, {
-    type: T;
-}> | undefined;
-/**
- * Parses a configurable scope string into a ConfigurableScopes object.
- * @param {string} scope - The scope string to parse
- * @returns {ConfigurableScopes | undefined} The parsed scope object if valid, undefined otherwise
- * @example
- * parseScope("user.create[role=field-agent|registration-agent]")
- * // Returns: { type: "user.create", options: { role: ["field-agent", "registration-agent"] } }
- */
+} | undefined;
 export declare function parseScope(scope: string): {
     type: "user.create";
     options: {
@@ -211,31 +146,9 @@ export declare function parseScope(scope: string): {
     options: {
         role: string[];
     };
-} | {
-    type: "workqueue";
-    options: {
-        id: string[];
-    };
-} | {
-    type: "record.notify";
-    options: {
-        event: string[];
-    };
 } | {
     type: "natlsysadmin" | "bypassratelimit" | "declare" | "register" | "validate" | "demo" | "certify" | "performance" | "sysadmin" | "teams" | "config" | "webhook" | "nationalId" | "notification-api" | "recordsearch" | "record.declare-birth" | "record.declare-birth:my-jurisdiction" | "record.declare-death" | "record.declare-death:my-jurisdiction" | "record.declare-marriage" | "record.declare-marriage:my-jurisdiction" | "record.declaration-submit-incomplete" | "record.declaration-submit-for-review" | "record.unassign-others" | "record.declaration-submit-for-approval" | "record.declaration-submit-for-updates" | "record.declaration-edit" | "record.review-duplicates" | "record.declaration-archive" | "record.declaration-reinstate" | "record.register" | "record.export-records" | "record.declaration-print" | "record.declaration-print-supporting-documents" | "record.registration-print" | "record.registration-print&issue-certified-copies" | "record.registration-print-certified-copies" | "record.registration-bulk-print-certified-copies" | "record.registration-verify-certified-copies" | "record.registration-request-correction" | "record.registration-correct" | "record.registration-request-revocation" | "record.registration-revoke" | "record.registration-request-reinstatement" | "record.registration-reinstate" | "record.confirm-registration" | "record.reject-registration" | "search.birth:my-jurisdiction" | "search.birth" | "search.death:my-jurisdiction" | "search.death" | "search.marriage:my-jurisdiction" | "search.marriage" | "record.read" | "record.read-audit" | "record.read-comments" | "record.create-comments" | "profile.update" | "profile.electronic-signature" | "performance.read" | "performance.read-dashboards" | "performance.vital-statistics-export" | "organisation.read-locations:all" | "organisation.read-locations:my-office" | "organisation.read-locations:my-jurisdiction" | "user.read:all" | "user.read:my-office" | "user.read:my-jurisdiction" | "user.read:only-my-audit" | "user.create:all" | "user.create:my-jurisdiction" | "user.update:all" | "user.update:my-jurisdiction" | "config.update:all" | "user.data-seeding";
 } | undefined;
-/**
- * Stringifies a ConfigurableScopes object into a scope string.
- * @param {ConfigurableScopes} scope - The scope object to stringify
- * @returns {string} The stringified scope in format "type[key1=value1|value2,key2=value3|value4]"
- * @example
- * stringifyScope({
- *   type: "record.notify",
- *   options: { event: ["v2.birth", "tennis-club-membership"] }
- * })
- * // Returns: "record.notify[event=v2.birth|tennis-club-membership]"
- */
-export declare function stringifyScope(scope: ConfigurableScopes): string;
 export declare const scopes: Scope[];
 export type ParsedScopes = NonNullable<ReturnType<typeof parseScope>>;
 export type RawScopes = z.infer<typeof LiteralScopes> | (string & {});

package/dist/scopes/index.js

@@ -23,8 +23,7 @@ __export(scopes_exports, {
   SCOPES: () => SCOPES,
   findScope: () => findScope,
   parseScope: () => parseScope,
-  scopes: () => scopes,
-  stringifyScope: () => stringifyScope
+  scopes: () => scopes
 });
 module.exports = __toCommonJS(scopes_exports);
 
@@ -217,7 +216,7 @@ var LiteralScopes = import_zod.z.union([
   import_zod.z.literal(SCOPES.CONFIG_UPDATE_ALL),
   import_zod.z.literal(SCOPES.USER_DATA_SEEDING)
 ]);
-var rawConfigurableScopeRegex = /^([a-zA-Z\.]+)\[((?:\w+=[\w.-]+(?:\|[\w.-]+)*)(?:,[\w]+=[\w.-]+(?:\|[\w.-]+)*)*)\]$/;
+var rawConfigurableScopeRegex = /^([a-zA-Z]+\.[a-zA-Z]+)\[((?:\w+=\w+(?:\|\w+)*)(:?,\w+=\w+(?:\|\w+)*)*)\]$/;
 var rawConfigurableScope = import_zod.z.string().regex(rawConfigurableScopeRegex);
 var CreateUserScope = import_zod.z.object({
   type: import_zod.z.literal("user.create"),
@@ -231,27 +230,12 @@ var EditUserScope = import_zod.z.object({
     role: import_zod.z.array(import_zod.z.string())
   })
 });
-var WorkqueueScope = import_zod.z.object({
-  type: import_zod.z.literal("workqueue"),
-  options: import_zod.z.object({
-    id: import_zod.z.array(import_zod.z.string())
-  })
-});
-var NotifyRecordScope = import_zod.z.object({
-  type: import_zod.z.literal("record.notify"),
-  options: import_zod.z.object({
-    event: import_zod.z.array(import_zod.z.string())
-  })
-});
 var ConfigurableScopes = import_zod.z.discriminatedUnion("type", [
   CreateUserScope,
-  EditUserScope,
-  WorkqueueScope,
-  NotifyRecordScope
+  EditUserScope
 ]);
 function findScope(scopes2, scopeType) {
-  const parsedScopes = scopes2.map((rawScope) => parseScope(rawScope));
-  return parsedScopes.find(
+  return scopes2.map((rawScope) => parseScope(rawScope)).find(
     (parsedScope) => parsedScope?.type === scopeType
   );
 }
@@ -263,25 +247,23 @@ function parseScope(scope) {
     };
   }
   const maybeConfigurableScope = rawConfigurableScope.safeParse(scope);
-  if (!maybeConfigurableScope.success) {
-    return;
+  if (maybeConfigurableScope.success) {
+    const rawScope = maybeConfigurableScope.data;
+    const [, type, rawOptions] = rawScope.match(rawConfigurableScopeRegex) ?? [];
+    const options = rawOptions.split(",").reduce((acc, option) => {
+      const [key, value] = option.split("=");
+      acc[key] = value.split("|");
+      return acc;
+    }, {});
+    const parsedScope = {
+      type,
+      options
+    };
+    const result = ConfigurableScopes.safeParse(parsedScope);
+    if (result.success) {
+      return result.data;
+    }
   }
-  const rawScope = maybeConfigurableScope.data;
-  const [, type, rawOptions] = rawScope.match(rawConfigurableScopeRegex) ?? [];
-  const options = rawOptions.split(",").reduce((acc, option) => {
-    const [key, value] = option.split("=");
-    acc[key] = value.split("|");
-    return acc;
-  }, {});
-  const parsedScope = {
-    type,
-    options
-  };
-  const result = ConfigurableScopes.safeParse(parsedScope);
-  return result.success ? result.data : void 0;
-}
-function stringifyScope(scope) {
-  const options = Object.entries(scope.options).map(([key, value]) => `${key}=${value.join("|")}`).join(",");
-  return `${scope.type}[${options}]`;
+  return void 0;
 }
 var scopes = Object.values(SCOPES);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencrvs/toolkit",
-  "version": "1.8.0-rc.f7a451a",
+  "version": "1.8.0-rc.f7bcb31",
   "description": "OpenCRVS toolkit for building country configurations",
   "license": "MPL-2.0",
   "exports": {
@@ -20,8 +20,7 @@
     "ajv-formats": "^3.0.1",
     "superjson": "1.9.0-0",
     "@trpc/client": "^11.0.0-rc.648",
-    "@trpc/server": "^11.0.0-rc.532",
-    "zod-openapi": "^4.2.4"
+    "@trpc/server": "^11.0.0-rc.532"
   },
   "devDependencies": {
     "@types/uuid": "^9.0.3",