@strapi/admin 5.52.0 → 5.52.2

package/dist/admin/admin/src/utils/rulesEngine.js

@@ -1,22 +1,41 @@
 'use strict';
 
 var jsonLogic = require('json-logic-js');
-var zod = require('zod');
+var z = require('zod/v4');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
+function _interopNamespace(e) {
+  if (e && e.__esModule) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n.default = e;
+  return Object.freeze(n);
+}
+
 var jsonLogic__default = /*#__PURE__*/_interopDefault(jsonLogic);
+var z__namespace = /*#__PURE__*/_interopNamespace(z);
 
-const ConditionSchema = zod.z.object({
-    dependsOn: zod.z.string().min(1),
-    operator: zod.z.enum([
+const ConditionSchema = z__namespace.object({
+    dependsOn: z__namespace.string().min(1),
+    operator: z__namespace.enum([
         'is',
         'isNot'
     ]),
-    value: zod.z.union([
-        zod.z.string(),
-        zod.z.number(),
-        zod.z.boolean()
+    value: z__namespace.union([
+        z__namespace.string(),
+        z__namespace.number(),
+        z__namespace.boolean()
     ])
 });
 function createRulesEngine() {
@@ -75,6 +94,5 @@ function createRulesEngine() {
     };
 }
 
-exports.ConditionSchema = ConditionSchema;
 exports.createRulesEngine = createRulesEngine;
 //# sourceMappingURL=rulesEngine.js.map

package/dist/admin/admin/src/utils/rulesEngine.js.map

@@ -1 +1 @@
-{"version":3,"file":"rulesEngine.js","sources":["../../../../../admin/src/utils/rulesEngine.ts"],"sourcesContent":["import jsonLogic from 'json-logic-js';\nimport { z } from 'zod';\n\nexport const ConditionSchema = z.object({\n  dependsOn: z.string().min(1),\n  operator: z.enum(['is', 'isNot']),\n  value: z.union([z.string(), z.number(), z.boolean()]),\n});\n\nexport type Condition = z.infer<typeof ConditionSchema>;\nexport type JsonLogicCondition = jsonLogic.RulesLogic<jsonLogic.AdditionalOperation>;\nexport type RulesEngine = {\n  generate: (condition: Condition) => JsonLogicCondition;\n  validate: (condition: Condition) => void;\n  evaluate: (condition: JsonLogicCondition, data: unknown) => boolean;\n};\n\nexport function createRulesEngine(): RulesEngine {\n  /**\n   * Transforms a high-level `Condition` object into a JSON Logic-compatible condition.\n   *\n   * Converts operators like 'is' and 'isNot' into their JSON Logic equivalents ('==' and '!=').\n   * Throws an error if the operator is not supported.\n   *\n   * @param condition - The condition object to convert.\n   * @returns A JSON Logic AST representing the condition.\n   * @throws {Error} If the operator is not recognized.\n   */\n  const generate = (condition: Condition): JsonLogicCondition => {\n    const { dependsOn, operator, value } = condition;\n    const operatorsMap = {\n      is: '==',\n      isNot: '!=',\n    };\n    if (!operatorsMap[operator]) {\n      throw new Error(`Invalid operator: ${operator}`);\n    }\n    return { [operatorsMap[operator]]: [{ var: dependsOn }, value] };\n  };\n\n  /**\n   * Validates a condition object against the `ConditionSchema`.\n   *\n   * Ensures that the condition adheres to the expected structure and types.\n   *\n   * @param condition - The condition object to validate.\n   * @throws {ZodError} If the condition is invalid.\n   */\n  const validate = (condition: Condition) => {\n    ConditionSchema.parse(condition);\n  };\n\n  /**\n   * Evaluates a JSON Logic condition against provided data.\n   * @throws {Error} If the condition is invalid.\n   */\n  const evaluate = (\n    condition: jsonLogic.RulesLogic<jsonLogic.AdditionalOperation>,\n    data: unknown\n  ): boolean => {\n    try {\n      return jsonLogic.apply(condition, data);\n    } catch (err: unknown) {\n      const message = err instanceof Error ? err.message : String(err);\n\n      throw new Error(`Invalid condition: ${message}`);\n    }\n  };\n\n  return {\n    generate,\n    validate,\n    evaluate,\n  };\n}\n"],"names":["ConditionSchema","z","object","dependsOn","string","min","operator","enum","value","union","number","boolean","createRulesEngine","generate","condition","operatorsMap","is","isNot","Error","var","validate","parse","evaluate","data","jsonLogic","apply","err","message","String"],"mappings":";;;;;;;;;AAGO,MAAMA,eAAAA,GAAkBC,KAAAA,CAAEC,MAAM,CAAC;AACtCC,IAAAA,SAAAA,EAAWF,KAAAA,CAAEG,MAAM,EAAA,CAAGC,GAAG,CAAC,CAAA,CAAA;IAC1BC,QAAAA,EAAUL,KAAAA,CAAEM,IAAI,CAAC;AAAC,QAAA,IAAA;AAAM,QAAA;AAAQ,KAAA,CAAA;IAChCC,KAAAA,EAAOP,KAAAA,CAAEQ,KAAK,CAAC;AAACR,QAAAA,KAAAA,CAAEG,MAAM,EAAA;AAAIH,QAAAA,KAAAA,CAAES,MAAM,EAAA;AAAIT,QAAAA,KAAAA,CAAEU,OAAO;AAAG,KAAA;AACtD,CAAA;AAUO,SAASC,iBAAAA,GAAAA;AACd;;;;;;;;;MAUA,MAAMC,WAAW,CAACC,SAAAA,GAAAA;AAChB,QAAA,MAAM,EAAEX,SAAS,EAAEG,QAAQ,EAAEE,KAAK,EAAE,GAAGM,SAAAA;AACvC,QAAA,MAAMC,YAAAA,GAAe;YACnBC,EAAAA,EAAI,IAAA;YACJC,KAAAA,EAAO;AACT,SAAA;AACA,QAAA,IAAI,CAACF,YAAY,CAACT,QAAAA,CAAS,EAAE;AAC3B,YAAA,MAAM,IAAIY,KAAAA,CAAM,CAAC,kBAAkB,EAAEZ,QAAAA,CAAAA,CAAU,CAAA;AACjD,QAAA;QACA,OAAO;AAAE,YAAA,CAACS,YAAY,CAACT,QAAAA,CAAS,GAAG;AAAC,gBAAA;oBAAEa,GAAAA,EAAKhB;AAAU,iBAAA;AAAGK,gBAAAA;AAAM;AAAC,SAAA;AACjE,IAAA,CAAA;AAEA;;;;;;;MAQA,MAAMY,WAAW,CAACN,SAAAA,GAAAA;AAChBd,QAAAA,eAAAA,CAAgBqB,KAAK,CAACP,SAAAA,CAAAA;AACxB,IAAA,CAAA;AAEA;;;MAIA,MAAMQ,QAAAA,GAAW,CACfR,SAAAA,EACAS,IAAAA,GAAAA;QAEA,IAAI;YACF,OAAOC,0BAAAA,CAAUC,KAAK,CAACX,SAAAA,EAAWS,IAAAA,CAAAA;AACpC,QAAA,CAAA,CAAE,OAAOG,GAAAA,EAAc;AACrB,YAAA,MAAMC,UAAUD,GAAAA,YAAeR,KAAAA,GAAQQ,GAAAA,CAAIC,OAAO,GAAGC,MAAAA,CAAOF,GAAAA,CAAAA;AAE5D,YAAA,MAAM,IAAIR,KAAAA,CAAM,CAAC,mBAAmB,EAAES,OAAAA,CAAAA,CAAS,CAAA;AACjD,QAAA;AACF,IAAA,CAAA;IAEA,OAAO;AACLd,QAAAA,QAAAA;AACAO,QAAAA,QAAAA;AACAE,QAAAA;AACF,KAAA;AACF;;;;;"}
+{"version":3,"file":"rulesEngine.js","sources":["../../../../../admin/src/utils/rulesEngine.ts"],"sourcesContent":["import jsonLogic from 'json-logic-js';\nimport * as z from 'zod/v4';\n\nconst ConditionSchema = z.object({\n  dependsOn: z.string().min(1),\n  operator: z.enum(['is', 'isNot']),\n  value: z.union([z.string(), z.number(), z.boolean()]),\n});\n\nexport type Condition = z.infer<typeof ConditionSchema>;\nexport type JsonLogicCondition = jsonLogic.RulesLogic<jsonLogic.AdditionalOperation>;\nexport type RulesEngine = {\n  generate: (condition: Condition) => JsonLogicCondition;\n  validate: (condition: Condition) => void;\n  evaluate: (condition: JsonLogicCondition, data: unknown) => boolean;\n};\n\nexport function createRulesEngine(): RulesEngine {\n  /**\n   * Transforms a high-level `Condition` object into a JSON Logic-compatible condition.\n   *\n   * Converts operators like 'is' and 'isNot' into their JSON Logic equivalents ('==' and '!=').\n   * Throws an error if the operator is not supported.\n   *\n   * @param condition - The condition object to convert.\n   * @returns A JSON Logic AST representing the condition.\n   * @throws {Error} If the operator is not recognized.\n   */\n  const generate = (condition: Condition): JsonLogicCondition => {\n    const { dependsOn, operator, value } = condition;\n    const operatorsMap = {\n      is: '==',\n      isNot: '!=',\n    };\n    if (!operatorsMap[operator]) {\n      throw new Error(`Invalid operator: ${operator}`);\n    }\n    return { [operatorsMap[operator]]: [{ var: dependsOn }, value] };\n  };\n\n  /**\n   * Validates a condition object against the `ConditionSchema`.\n   *\n   * Ensures that the condition adheres to the expected structure and types.\n   *\n   * @param condition - The condition object to validate.\n   * @throws {ZodError} If the condition is invalid.\n   */\n  const validate = (condition: Condition) => {\n    ConditionSchema.parse(condition);\n  };\n\n  /**\n   * Evaluates a JSON Logic condition against provided data.\n   * @throws {Error} If the condition is invalid.\n   */\n  const evaluate = (\n    condition: jsonLogic.RulesLogic<jsonLogic.AdditionalOperation>,\n    data: unknown\n  ): boolean => {\n    try {\n      return jsonLogic.apply(condition, data);\n    } catch (err: unknown) {\n      const message = err instanceof Error ? err.message : String(err);\n\n      throw new Error(`Invalid condition: ${message}`);\n    }\n  };\n\n  return {\n    generate,\n    validate,\n    evaluate,\n  };\n}\n"],"names":["ConditionSchema","z","object","dependsOn","string","min","operator","enum","value","union","number","boolean","createRulesEngine","generate","condition","operatorsMap","is","isNot","Error","var","validate","parse","evaluate","data","jsonLogic","apply","err","message","String"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,MAAMA,eAAAA,GAAkBC,YAAAA,CAAEC,MAAM,CAAC;AAC/BC,IAAAA,SAAAA,EAAWF,YAAAA,CAAEG,MAAM,EAAA,CAAGC,GAAG,CAAC,CAAA,CAAA;IAC1BC,QAAAA,EAAUL,YAAAA,CAAEM,IAAI,CAAC;AAAC,QAAA,IAAA;AAAM,QAAA;AAAQ,KAAA,CAAA;IAChCC,KAAAA,EAAOP,YAAAA,CAAEQ,KAAK,CAAC;AAACR,QAAAA,YAAAA,CAAEG,MAAM,EAAA;AAAIH,QAAAA,YAAAA,CAAES,MAAM,EAAA;AAAIT,QAAAA,YAAAA,CAAEU,OAAO;AAAG,KAAA;AACtD,CAAA,CAAA;AAUO,SAASC,iBAAAA,GAAAA;AACd;;;;;;;;;MAUA,MAAMC,WAAW,CAACC,SAAAA,GAAAA;AAChB,QAAA,MAAM,EAAEX,SAAS,EAAEG,QAAQ,EAAEE,KAAK,EAAE,GAAGM,SAAAA;AACvC,QAAA,MAAMC,YAAAA,GAAe;YACnBC,EAAAA,EAAI,IAAA;YACJC,KAAAA,EAAO;AACT,SAAA;AACA,QAAA,IAAI,CAACF,YAAY,CAACT,QAAAA,CAAS,EAAE;AAC3B,YAAA,MAAM,IAAIY,KAAAA,CAAM,CAAC,kBAAkB,EAAEZ,QAAAA,CAAAA,CAAU,CAAA;AACjD,QAAA;QACA,OAAO;AAAE,YAAA,CAACS,YAAY,CAACT,QAAAA,CAAS,GAAG;AAAC,gBAAA;oBAAEa,GAAAA,EAAKhB;AAAU,iBAAA;AAAGK,gBAAAA;AAAM;AAAC,SAAA;AACjE,IAAA,CAAA;AAEA;;;;;;;MAQA,MAAMY,WAAW,CAACN,SAAAA,GAAAA;AAChBd,QAAAA,eAAAA,CAAgBqB,KAAK,CAACP,SAAAA,CAAAA;AACxB,IAAA,CAAA;AAEA;;;MAIA,MAAMQ,QAAAA,GAAW,CACfR,SAAAA,EACAS,IAAAA,GAAAA;QAEA,IAAI;YACF,OAAOC,0BAAAA,CAAUC,KAAK,CAACX,SAAAA,EAAWS,IAAAA,CAAAA;AACpC,QAAA,CAAA,CAAE,OAAOG,GAAAA,EAAc;AACrB,YAAA,MAAMC,UAAUD,GAAAA,YAAeR,KAAAA,GAAQQ,GAAAA,CAAIC,OAAO,GAAGC,MAAAA,CAAOF,GAAAA,CAAAA;AAE5D,YAAA,MAAM,IAAIR,KAAAA,CAAM,CAAC,mBAAmB,EAAES,OAAAA,CAAAA,CAAS,CAAA;AACjD,QAAA;AACF,IAAA,CAAA;IAEA,OAAO;AACLd,QAAAA,QAAAA;AACAO,QAAAA,QAAAA;AACAE,QAAAA;AACF,KAAA;AACF;;;;"}

package/dist/admin/admin/src/utils/rulesEngine.mjs

@@ -1,5 +1,5 @@
 import jsonLogic from 'json-logic-js';
-import { z } from 'zod';
+import * as z from 'zod/v4';
 
 const ConditionSchema = z.object({
     dependsOn: z.string().min(1),
@@ -69,5 +69,5 @@ function createRulesEngine() {
     };
 }
 
-export { ConditionSchema, createRulesEngine };
+export { createRulesEngine };
 //# sourceMappingURL=rulesEngine.mjs.map

package/dist/admin/admin/src/utils/rulesEngine.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"rulesEngine.mjs","sources":["../../../../../admin/src/utils/rulesEngine.ts"],"sourcesContent":["import jsonLogic from 'json-logic-js';\nimport { z } from 'zod';\n\nexport const ConditionSchema = z.object({\n  dependsOn: z.string().min(1),\n  operator: z.enum(['is', 'isNot']),\n  value: z.union([z.string(), z.number(), z.boolean()]),\n});\n\nexport type Condition = z.infer<typeof ConditionSchema>;\nexport type JsonLogicCondition = jsonLogic.RulesLogic<jsonLogic.AdditionalOperation>;\nexport type RulesEngine = {\n  generate: (condition: Condition) => JsonLogicCondition;\n  validate: (condition: Condition) => void;\n  evaluate: (condition: JsonLogicCondition, data: unknown) => boolean;\n};\n\nexport function createRulesEngine(): RulesEngine {\n  /**\n   * Transforms a high-level `Condition` object into a JSON Logic-compatible condition.\n   *\n   * Converts operators like 'is' and 'isNot' into their JSON Logic equivalents ('==' and '!=').\n   * Throws an error if the operator is not supported.\n   *\n   * @param condition - The condition object to convert.\n   * @returns A JSON Logic AST representing the condition.\n   * @throws {Error} If the operator is not recognized.\n   */\n  const generate = (condition: Condition): JsonLogicCondition => {\n    const { dependsOn, operator, value } = condition;\n    const operatorsMap = {\n      is: '==',\n      isNot: '!=',\n    };\n    if (!operatorsMap[operator]) {\n      throw new Error(`Invalid operator: ${operator}`);\n    }\n    return { [operatorsMap[operator]]: [{ var: dependsOn }, value] };\n  };\n\n  /**\n   * Validates a condition object against the `ConditionSchema`.\n   *\n   * Ensures that the condition adheres to the expected structure and types.\n   *\n   * @param condition - The condition object to validate.\n   * @throws {ZodError} If the condition is invalid.\n   */\n  const validate = (condition: Condition) => {\n    ConditionSchema.parse(condition);\n  };\n\n  /**\n   * Evaluates a JSON Logic condition against provided data.\n   * @throws {Error} If the condition is invalid.\n   */\n  const evaluate = (\n    condition: jsonLogic.RulesLogic<jsonLogic.AdditionalOperation>,\n    data: unknown\n  ): boolean => {\n    try {\n      return jsonLogic.apply(condition, data);\n    } catch (err: unknown) {\n      const message = err instanceof Error ? err.message : String(err);\n\n      throw new Error(`Invalid condition: ${message}`);\n    }\n  };\n\n  return {\n    generate,\n    validate,\n    evaluate,\n  };\n}\n"],"names":["ConditionSchema","z","object","dependsOn","string","min","operator","enum","value","union","number","boolean","createRulesEngine","generate","condition","operatorsMap","is","isNot","Error","var","validate","parse","evaluate","data","jsonLogic","apply","err","message","String"],"mappings":";;;AAGO,MAAMA,eAAAA,GAAkBC,CAAAA,CAAEC,MAAM,CAAC;AACtCC,IAAAA,SAAAA,EAAWF,CAAAA,CAAEG,MAAM,EAAA,CAAGC,GAAG,CAAC,CAAA,CAAA;IAC1BC,QAAAA,EAAUL,CAAAA,CAAEM,IAAI,CAAC;AAAC,QAAA,IAAA;AAAM,QAAA;AAAQ,KAAA,CAAA;IAChCC,KAAAA,EAAOP,CAAAA,CAAEQ,KAAK,CAAC;AAACR,QAAAA,CAAAA,CAAEG,MAAM,EAAA;AAAIH,QAAAA,CAAAA,CAAES,MAAM,EAAA;AAAIT,QAAAA,CAAAA,CAAEU,OAAO;AAAG,KAAA;AACtD,CAAA;AAUO,SAASC,iBAAAA,GAAAA;AACd;;;;;;;;;MAUA,MAAMC,WAAW,CAACC,SAAAA,GAAAA;AAChB,QAAA,MAAM,EAAEX,SAAS,EAAEG,QAAQ,EAAEE,KAAK,EAAE,GAAGM,SAAAA;AACvC,QAAA,MAAMC,YAAAA,GAAe;YACnBC,EAAAA,EAAI,IAAA;YACJC,KAAAA,EAAO;AACT,SAAA;AACA,QAAA,IAAI,CAACF,YAAY,CAACT,QAAAA,CAAS,EAAE;AAC3B,YAAA,MAAM,IAAIY,KAAAA,CAAM,CAAC,kBAAkB,EAAEZ,QAAAA,CAAAA,CAAU,CAAA;AACjD,QAAA;QACA,OAAO;AAAE,YAAA,CAACS,YAAY,CAACT,QAAAA,CAAS,GAAG;AAAC,gBAAA;oBAAEa,GAAAA,EAAKhB;AAAU,iBAAA;AAAGK,gBAAAA;AAAM;AAAC,SAAA;AACjE,IAAA,CAAA;AAEA;;;;;;;MAQA,MAAMY,WAAW,CAACN,SAAAA,GAAAA;AAChBd,QAAAA,eAAAA,CAAgBqB,KAAK,CAACP,SAAAA,CAAAA;AACxB,IAAA,CAAA;AAEA;;;MAIA,MAAMQ,QAAAA,GAAW,CACfR,SAAAA,EACAS,IAAAA,GAAAA;QAEA,IAAI;YACF,OAAOC,SAAAA,CAAUC,KAAK,CAACX,SAAAA,EAAWS,IAAAA,CAAAA;AACpC,QAAA,CAAA,CAAE,OAAOG,GAAAA,EAAc;AACrB,YAAA,MAAMC,UAAUD,GAAAA,YAAeR,KAAAA,GAAQQ,GAAAA,CAAIC,OAAO,GAAGC,MAAAA,CAAOF,GAAAA,CAAAA;AAE5D,YAAA,MAAM,IAAIR,KAAAA,CAAM,CAAC,mBAAmB,EAAES,OAAAA,CAAAA,CAAS,CAAA;AACjD,QAAA;AACF,IAAA,CAAA;IAEA,OAAO;AACLd,QAAAA,QAAAA;AACAO,QAAAA,QAAAA;AACAE,QAAAA;AACF,KAAA;AACF;;;;"}
+{"version":3,"file":"rulesEngine.mjs","sources":["../../../../../admin/src/utils/rulesEngine.ts"],"sourcesContent":["import jsonLogic from 'json-logic-js';\nimport * as z from 'zod/v4';\n\nconst ConditionSchema = z.object({\n  dependsOn: z.string().min(1),\n  operator: z.enum(['is', 'isNot']),\n  value: z.union([z.string(), z.number(), z.boolean()]),\n});\n\nexport type Condition = z.infer<typeof ConditionSchema>;\nexport type JsonLogicCondition = jsonLogic.RulesLogic<jsonLogic.AdditionalOperation>;\nexport type RulesEngine = {\n  generate: (condition: Condition) => JsonLogicCondition;\n  validate: (condition: Condition) => void;\n  evaluate: (condition: JsonLogicCondition, data: unknown) => boolean;\n};\n\nexport function createRulesEngine(): RulesEngine {\n  /**\n   * Transforms a high-level `Condition` object into a JSON Logic-compatible condition.\n   *\n   * Converts operators like 'is' and 'isNot' into their JSON Logic equivalents ('==' and '!=').\n   * Throws an error if the operator is not supported.\n   *\n   * @param condition - The condition object to convert.\n   * @returns A JSON Logic AST representing the condition.\n   * @throws {Error} If the operator is not recognized.\n   */\n  const generate = (condition: Condition): JsonLogicCondition => {\n    const { dependsOn, operator, value } = condition;\n    const operatorsMap = {\n      is: '==',\n      isNot: '!=',\n    };\n    if (!operatorsMap[operator]) {\n      throw new Error(`Invalid operator: ${operator}`);\n    }\n    return { [operatorsMap[operator]]: [{ var: dependsOn }, value] };\n  };\n\n  /**\n   * Validates a condition object against the `ConditionSchema`.\n   *\n   * Ensures that the condition adheres to the expected structure and types.\n   *\n   * @param condition - The condition object to validate.\n   * @throws {ZodError} If the condition is invalid.\n   */\n  const validate = (condition: Condition) => {\n    ConditionSchema.parse(condition);\n  };\n\n  /**\n   * Evaluates a JSON Logic condition against provided data.\n   * @throws {Error} If the condition is invalid.\n   */\n  const evaluate = (\n    condition: jsonLogic.RulesLogic<jsonLogic.AdditionalOperation>,\n    data: unknown\n  ): boolean => {\n    try {\n      return jsonLogic.apply(condition, data);\n    } catch (err: unknown) {\n      const message = err instanceof Error ? err.message : String(err);\n\n      throw new Error(`Invalid condition: ${message}`);\n    }\n  };\n\n  return {\n    generate,\n    validate,\n    evaluate,\n  };\n}\n"],"names":["ConditionSchema","z","object","dependsOn","string","min","operator","enum","value","union","number","boolean","createRulesEngine","generate","condition","operatorsMap","is","isNot","Error","var","validate","parse","evaluate","data","jsonLogic","apply","err","message","String"],"mappings":";;;AAGA,MAAMA,eAAAA,GAAkBC,CAAAA,CAAEC,MAAM,CAAC;AAC/BC,IAAAA,SAAAA,EAAWF,CAAAA,CAAEG,MAAM,EAAA,CAAGC,GAAG,CAAC,CAAA,CAAA;IAC1BC,QAAAA,EAAUL,CAAAA,CAAEM,IAAI,CAAC;AAAC,QAAA,IAAA;AAAM,QAAA;AAAQ,KAAA,CAAA;IAChCC,KAAAA,EAAOP,CAAAA,CAAEQ,KAAK,CAAC;AAACR,QAAAA,CAAAA,CAAEG,MAAM,EAAA;AAAIH,QAAAA,CAAAA,CAAES,MAAM,EAAA;AAAIT,QAAAA,CAAAA,CAAEU,OAAO;AAAG,KAAA;AACtD,CAAA,CAAA;AAUO,SAASC,iBAAAA,GAAAA;AACd;;;;;;;;;MAUA,MAAMC,WAAW,CAACC,SAAAA,GAAAA;AAChB,QAAA,MAAM,EAAEX,SAAS,EAAEG,QAAQ,EAAEE,KAAK,EAAE,GAAGM,SAAAA;AACvC,QAAA,MAAMC,YAAAA,GAAe;YACnBC,EAAAA,EAAI,IAAA;YACJC,KAAAA,EAAO;AACT,SAAA;AACA,QAAA,IAAI,CAACF,YAAY,CAACT,QAAAA,CAAS,EAAE;AAC3B,YAAA,MAAM,IAAIY,KAAAA,CAAM,CAAC,kBAAkB,EAAEZ,QAAAA,CAAAA,CAAU,CAAA;AACjD,QAAA;QACA,OAAO;AAAE,YAAA,CAACS,YAAY,CAACT,QAAAA,CAAS,GAAG;AAAC,gBAAA;oBAAEa,GAAAA,EAAKhB;AAAU,iBAAA;AAAGK,gBAAAA;AAAM;AAAC,SAAA;AACjE,IAAA,CAAA;AAEA;;;;;;;MAQA,MAAMY,WAAW,CAACN,SAAAA,GAAAA;AAChBd,QAAAA,eAAAA,CAAgBqB,KAAK,CAACP,SAAAA,CAAAA;AACxB,IAAA,CAAA;AAEA;;;MAIA,MAAMQ,QAAAA,GAAW,CACfR,SAAAA,EACAS,IAAAA,GAAAA;QAEA,IAAI;YACF,OAAOC,SAAAA,CAAUC,KAAK,CAACX,SAAAA,EAAWS,IAAAA,CAAAA;AACpC,QAAA,CAAA,CAAE,OAAOG,GAAAA,EAAc;AACrB,YAAA,MAAMC,UAAUD,GAAAA,YAAeR,KAAAA,GAAQQ,GAAAA,CAAIC,OAAO,GAAGC,MAAAA,CAAOF,GAAAA,CAAAA;AAE5D,YAAA,MAAM,IAAIR,KAAAA,CAAM,CAAC,mBAAmB,EAAES,OAAAA,CAAAA,CAAS,CAAA;AACjD,QAAA;AACF,IAAA,CAAA;IAEA,OAAO;AACLd,QAAAA,QAAAA;AACAO,QAAAA,QAAAA;AACAE,QAAAA;AACF,KAAA;AACF;;;;"}

package/dist/admin/index.js

@@ -116,7 +116,6 @@ exports.storeToken = getFetchClient.storeToken;
 exports.triggerSessionExpired = getFetchClient.triggerSessionExpired;
 exports.fetchBaseQuery = baseQuery.fetchBaseQuery;
 exports.isBaseQueryError = baseQuery.isBaseQueryError;
-exports.ConditionSchema = rulesEngine.ConditionSchema;
 exports.createRulesEngine = rulesEngine.createRulesEngine;
 exports.getDisplayName = users.getDisplayName;
 exports.getInitials = users.getInitials;

package/dist/admin/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/admin/index.mjs

@@ -41,7 +41,7 @@ export { useGetCountDocumentsQuery } from './admin/src/services/homepage.mjs';
 export { translatedErrors } from './admin/src/utils/translatedErrors.mjs';
 export { FetchError, attemptTokenRefresh, getFetchClient, isFetchError, setOnSessionExpired, setOnTokenUpdate, storeToken, triggerSessionExpired } from './admin/src/utils/getFetchClient.mjs';
 export { fetchBaseQuery, isBaseQueryError } from './admin/src/utils/baseQuery.mjs';
-export { ConditionSchema, createRulesEngine } from './admin/src/utils/rulesEngine.mjs';
+export { createRulesEngine } from './admin/src/utils/rulesEngine.mjs';
 export { getDisplayName, getInitials, hashAdminUserEmail } from './admin/src/utils/users.mjs';
 export { adminApi } from './admin/src/services/api.mjs';
 export { Layouts } from './admin/src/components/Layouts/Layout.mjs';

package/dist/admin/src/pages/Auth/constants.d.ts

@@ -1,14 +1,28 @@
 import type { ComponentType } from 'react';
 import { RegisterProps } from './components/Register';
-export type AuthType = 'login' | 'register' | 'register-admin' | 'forgot-password' | 'reset-password' | 'forgot-password-success' | 'oops' | 'providers';
+export declare const AUTH_TYPES: {
+    readonly LOGIN: "login";
+    readonly REGISTER: "register";
+    readonly REGISTER_ADMIN: "register-admin";
+    readonly FORGOT_PASSWORD: "forgot-password";
+    readonly RESET_PASSWORD: "reset-password";
+    readonly FORGOT_PASSWORD_SUCCESS: "forgot-password-success";
+    readonly OOPS: "oops";
+    readonly PROVIDERS: "providers";
+};
+export type AuthType = (typeof AUTH_TYPES)[keyof typeof AUTH_TYPES];
+/**
+ * Narrows the `:authType` route param, which is an arbitrary string, to a known auth type.
+ */
+export declare const isAuthType: (value: string | undefined) => value is AuthType;
 export type FormDictionary = Record<AuthType, ComponentType | ComponentType<RegisterProps>>;
 export declare const FORMS: {
-    'forgot-password': () => import("react/jsx-runtime").JSX.Element;
-    'forgot-password-success': () => import("react/jsx-runtime").JSX.Element;
+    "forgot-password": () => import("react/jsx-runtime").JSX.Element;
+    "forgot-password-success": () => import("react/jsx-runtime").JSX.Element;
     login: () => null;
     oops: () => import("react/jsx-runtime").JSX.Element;
     register: ({ hasAdmin }: RegisterProps) => import("react/jsx-runtime").JSX.Element;
-    'register-admin': ({ hasAdmin }: RegisterProps) => import("react/jsx-runtime").JSX.Element;
-    'reset-password': () => import("react/jsx-runtime").JSX.Element;
+    "register-admin": ({ hasAdmin }: RegisterProps) => import("react/jsx-runtime").JSX.Element;
+    "reset-password": () => import("react/jsx-runtime").JSX.Element;
     providers: () => null;
 };

package/dist/admin/src/pages/Auth/utils.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Reads the `?redirectTo` the user was sent to the auth pages with, so that logging in from a
+ * deep link returns them to where they started instead of the home page.
+ *
+ * Falls back to the home page when the param is absent, empty, or not a same-app path.
+ */
+export declare const getRedirectTo: (search: string) => string;

package/dist/admin/src/utils/rulesEngine.d.ts

@@ -1,18 +1,13 @@
 import jsonLogic from 'json-logic-js';
-import { z } from 'zod';
-export declare const ConditionSchema: z.ZodObject<{
+import * as z from 'zod/v4';
+declare const ConditionSchema: z.ZodObject<{
     dependsOn: z.ZodString;
-    operator: z.ZodEnum<["is", "isNot"]>;
-    value: z.ZodUnion<[z.ZodString, z.ZodNumber, z.ZodBoolean]>;
-}, "strip", z.ZodTypeAny, {
-    value: string | number | boolean;
-    operator: "is" | "isNot";
-    dependsOn: string;
-}, {
-    value: string | number | boolean;
-    operator: "is" | "isNot";
-    dependsOn: string;
-}>;
+    operator: z.ZodEnum<{
+        is: "is";
+        isNot: "isNot";
+    }>;
+    value: z.ZodUnion<readonly [z.ZodString, z.ZodNumber, z.ZodBoolean]>;
+}, z.core.$strip>;
 export type Condition = z.infer<typeof ConditionSchema>;
 export type JsonLogicCondition = jsonLogic.RulesLogic<jsonLogic.AdditionalOperation>;
 export type RulesEngine = {
@@ -21,3 +16,4 @@ export type RulesEngine = {
     evaluate: (condition: JsonLogicCondition, data: unknown) => boolean;
 };
 export declare function createRulesEngine(): RulesEngine;
+export {};

package/dist/ee/server/src/audit-logs/services/audit-logs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"audit-logs.d.ts","sourceRoot":"","sources":["../../../../../../ee/server/src/audit-logs/services/audit-logs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAE1C,UAAU,KAAK;IACb,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,IAAI,CAAC;IACX,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAsBD;;;GAGG;AACH,QAAA,MAAM,sBAAsB,GAAI,QAAQ,IAAI,CAAC,MAAM;qBAExB,KAAK;oBAWN,OAAO;;;;;;;;;yBAqBF;QAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;;;;;;;;;;;;;gBAmC/D,OAAO;wCAkBW,IAAI;CAU3C,CAAC;AAEF,OAAO,EAAE,sBAAsB,EAAE,CAAC"}
+{"version":3,"file":"audit-logs.d.ts","sourceRoot":"","sources":["../../../../../../ee/server/src/audit-logs/services/audit-logs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAE1C,UAAU,KAAK;IACb,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,IAAI,CAAC;IACX,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAsBD;;;GAGG;AACH,QAAA,MAAM,sBAAsB,GAAI,QAAQ,IAAI,CAAC,MAAM;qBAExB,KAAK;oBAWN,OAAO;;;;;;;;;yBAiCF;QAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;;;;;;;;;;;;;gBAmC/D,OAAO;wCAkBW,IAAI;CAU3C,CAAC;AAEF,OAAO,EAAE,sBAAsB,EAAE,CAAC"}

package/dist/server/ee/server/src/audit-logs/services/audit-logs.js

@@ -31,7 +31,21 @@ const getSanitizedUser = (user)=>{
             return this;
         },
         async findMany (query) {
-            const { results, pagination } = await strapi.db.query('admin::audit-log').findPage({
+            // NOTE: We get the IDs first because sorting full rows runs MySQL/MariaDB out of sort memory
+            // See: https://github.com/strapi/strapi/issues/27399
+            const { results: logRows, pagination } = await strapi.db.query('admin::audit-log').findPage({
+                ...strapi.get('query-params').transform('admin::audit-log', query),
+                select: [
+                    'id'
+                ]
+            });
+            const ids = logRows.map((log)=>log.id);
+            const logs = ids.length ? await strapi.db.query('admin::audit-log').findMany({
+                where: {
+                    id: {
+                        $in: ids
+                    }
+                },
                 populate: [
                     'user'
                 ],
@@ -39,9 +53,13 @@ const getSanitizedUser = (user)=>{
                     'action',
                     'date',
                     'payload'
-                ],
-                ...strapi.get('query-params').transform('admin::audit-log', query)
-            });
+                ]
+            }) : [];
+            const logsById = new Map(logs.map((log)=>[
+                    log.id,
+                    log
+                ]));
+            const results = ids.map((id)=>logsById.get(id)).filter(Boolean);
             const sanitizedResults = results.map((result)=>{
                 const { user, ...rest } = result;
                 return {

package/dist/server/ee/server/src/audit-logs/services/audit-logs.js.map

@@ -1 +1 @@
-{"version":3,"file":"audit-logs.js","sources":["../../../../../../../ee/server/src/audit-logs/services/audit-logs.ts"],"sourcesContent":["import type { Core } from '@strapi/types';\n\ninterface Event {\n  action: string;\n  date: Date;\n  userId: string | number;\n  payload: Record<string, unknown>;\n}\n\ninterface Log extends Omit<Event, 'userId'> {\n  user: string | number;\n}\n\nconst getSanitizedUser = (user: any) => {\n  let displayName = user.email;\n\n  if (user.username) {\n    displayName = user.username;\n  } else if (user.firstname && user.lastname) {\n    displayName = `${user.firstname} ${user.lastname}`;\n  }\n\n  return {\n    id: user.id,\n    email: user.email,\n    displayName,\n  };\n};\n\n/**\n * @description\n * Manages audit logs interaction with the database. Accessible via strapi.get('audit-logs')\n */\nconst createAuditLogsService = (strapi: Core.Strapi) => {\n  return {\n    async saveEvent(event: Event) {\n      const { userId, ...rest } = event;\n\n      const auditLog: Log = { ...rest, user: userId };\n\n      // Save to database\n      await strapi.db.query('admin::audit-log').create({ data: auditLog });\n\n      return this;\n    },\n\n    async findMany(query: unknown) {\n      const { results, pagination } = await strapi.db.query('admin::audit-log').findPage({\n        populate: ['user'],\n        select: ['action', 'date', 'payload'],\n        ...strapi.get('query-params').transform('admin::audit-log', query),\n      });\n\n      const sanitizedResults = results.map((result: any) => {\n        const { user, ...rest } = result;\n        return {\n          ...rest,\n          user: user ? getSanitizedUser(user) : null,\n        };\n      });\n\n      return {\n        results: sanitizedResults,\n        pagination,\n      };\n    },\n\n    async findManyUsers(query: { page?: number | string; pageSize?: number | string }) {\n      const { page = 1, pageSize = 10 } = query;\n\n      const userAttribute = strapi.db.metadata.get('admin::audit-log').attributes.user;\n\n      if (\n        userAttribute?.type !== 'relation' ||\n        !('joinTable' in userAttribute) ||\n        !userAttribute.joinTable ||\n        !('inverseJoinColumn' in userAttribute.joinTable)\n      ) {\n        throw new Error('The audit log user relation is expected to use a join table');\n      }\n\n      const { joinTable } = userAttribute;\n\n      const authorIds = await strapi.db\n        .connection(joinTable.name)\n        .distinct(joinTable.inverseJoinColumn.name)\n        .pluck(joinTable.inverseJoinColumn.name);\n\n      const { results, pagination } = await strapi.db.query('admin::user').findPage({\n        select: ['id', 'email', 'username', 'firstname', 'lastname'],\n        where: { id: { $in: authorIds } },\n        orderBy: { id: 'asc' },\n        page: Number(page),\n        pageSize: Number(pageSize),\n      });\n\n      return {\n        results: results.map(getSanitizedUser),\n        pagination,\n      };\n    },\n\n    async findOne(id: unknown) {\n      const result: any = await strapi.db.query('admin::audit-log').findOne({\n        where: { id },\n        populate: ['user'],\n        select: ['action', 'date', 'payload'],\n      });\n\n      if (!result) {\n        return null;\n      }\n\n      const { user, ...rest } = result;\n      return {\n        ...rest,\n        user: user ? getSanitizedUser(user) : null,\n      };\n    },\n\n    deleteExpiredEvents(expirationDate: Date) {\n      return strapi.db.query('admin::audit-log').deleteMany({\n        where: {\n          date: {\n            $lt: expirationDate.toISOString(),\n          },\n        },\n      });\n    },\n  };\n};\n\nexport { createAuditLogsService };\n"],"names":["getSanitizedUser","user","displayName","email","username","firstname","lastname","id","createAuditLogsService","strapi","saveEvent","event","userId","rest","auditLog","db","query","create","data","findMany","results","pagination","findPage","populate","select","get","transform","sanitizedResults","map","result","findManyUsers","page","pageSize","userAttribute","metadata","attributes","type","joinTable","Error","authorIds","connection","name","distinct","inverseJoinColumn","pluck","where","$in","orderBy","Number","findOne","deleteExpiredEvents","expirationDate","deleteMany","date","$lt","toISOString"],"mappings":"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"}
+{"version":3,"file":"audit-logs.js","sources":["../../../../../../../ee/server/src/audit-logs/services/audit-logs.ts"],"sourcesContent":["import type { Core } from '@strapi/types';\n\ninterface Event {\n  action: string;\n  date: Date;\n  userId: string | number;\n  payload: Record<string, unknown>;\n}\n\ninterface Log extends Omit<Event, 'userId'> {\n  user: string | number;\n}\n\nconst getSanitizedUser = (user: any) => {\n  let displayName = user.email;\n\n  if (user.username) {\n    displayName = user.username;\n  } else if (user.firstname && user.lastname) {\n    displayName = `${user.firstname} ${user.lastname}`;\n  }\n\n  return {\n    id: user.id,\n    email: user.email,\n    displayName,\n  };\n};\n\n/**\n * @description\n * Manages audit logs interaction with the database. Accessible via strapi.get('audit-logs')\n */\nconst createAuditLogsService = (strapi: Core.Strapi) => {\n  return {\n    async saveEvent(event: Event) {\n      const { userId, ...rest } = event;\n\n      const auditLog: Log = { ...rest, user: userId };\n\n      // Save to database\n      await strapi.db.query('admin::audit-log').create({ data: auditLog });\n\n      return this;\n    },\n\n    async findMany(query: unknown) {\n      // NOTE: We get the IDs first because sorting full rows runs MySQL/MariaDB out of sort memory\n      // See: https://github.com/strapi/strapi/issues/27399\n      const { results: logRows, pagination } = await strapi.db.query('admin::audit-log').findPage({\n        ...strapi.get('query-params').transform('admin::audit-log', query),\n        select: ['id'],\n      });\n\n      const ids = logRows.map((log) => log.id);\n      const logs = ids.length\n        ? await strapi.db.query('admin::audit-log').findMany({\n            where: { id: { $in: ids } },\n            populate: ['user'],\n            select: ['action', 'date', 'payload'],\n          })\n        : [];\n      const logsById = new Map(logs.map((log) => [log.id, log]));\n      const results = ids.map((id) => logsById.get(id)).filter(Boolean);\n\n      const sanitizedResults = results.map((result: any) => {\n        const { user, ...rest } = result;\n        return {\n          ...rest,\n          user: user ? getSanitizedUser(user) : null,\n        };\n      });\n\n      return {\n        results: sanitizedResults,\n        pagination,\n      };\n    },\n\n    async findManyUsers(query: { page?: number | string; pageSize?: number | string }) {\n      const { page = 1, pageSize = 10 } = query;\n\n      const userAttribute = strapi.db.metadata.get('admin::audit-log').attributes.user;\n\n      if (\n        userAttribute?.type !== 'relation' ||\n        !('joinTable' in userAttribute) ||\n        !userAttribute.joinTable ||\n        !('inverseJoinColumn' in userAttribute.joinTable)\n      ) {\n        throw new Error('The audit log user relation is expected to use a join table');\n      }\n\n      const { joinTable } = userAttribute;\n\n      const authorIds = await strapi.db\n        .connection(joinTable.name)\n        .distinct(joinTable.inverseJoinColumn.name)\n        .pluck(joinTable.inverseJoinColumn.name);\n\n      const { results, pagination } = await strapi.db.query('admin::user').findPage({\n        select: ['id', 'email', 'username', 'firstname', 'lastname'],\n        where: { id: { $in: authorIds } },\n        orderBy: { id: 'asc' },\n        page: Number(page),\n        pageSize: Number(pageSize),\n      });\n\n      return {\n        results: results.map(getSanitizedUser),\n        pagination,\n      };\n    },\n\n    async findOne(id: unknown) {\n      const result: any = await strapi.db.query('admin::audit-log').findOne({\n        where: { id },\n        populate: ['user'],\n        select: ['action', 'date', 'payload'],\n      });\n\n      if (!result) {\n        return null;\n      }\n\n      const { user, ...rest } = result;\n      return {\n        ...rest,\n        user: user ? getSanitizedUser(user) : null,\n      };\n    },\n\n    deleteExpiredEvents(expirationDate: Date) {\n      return strapi.db.query('admin::audit-log').deleteMany({\n        where: {\n          date: {\n            $lt: expirationDate.toISOString(),\n          },\n        },\n      });\n    },\n  };\n};\n\nexport { createAuditLogsService };\n"],"names":["getSanitizedUser","user","displayName","email","username","firstname","lastname","id","createAuditLogsService","strapi","saveEvent","event","userId","rest","auditLog","db","query","create","data","findMany","results","logRows","pagination","findPage","get","transform","select","ids","map","log","logs","length","where","$in","populate","logsById","Map","filter","Boolean","sanitizedResults","result","findManyUsers","page","pageSize","userAttribute","metadata","attributes","type","joinTable","Error","authorIds","connection","name","distinct","inverseJoinColumn","pluck","orderBy","Number","findOne","deleteExpiredEvents","expirationDate","deleteMany","date","$lt","toISOString"],"mappings":"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"}

package/dist/server/ee/server/src/audit-logs/services/audit-logs.mjs

@@ -29,7 +29,21 @@ const getSanitizedUser = (user)=>{
             return this;
         },
         async findMany (query) {
-            const { results, pagination } = await strapi.db.query('admin::audit-log').findPage({
+            // NOTE: We get the IDs first because sorting full rows runs MySQL/MariaDB out of sort memory
+            // See: https://github.com/strapi/strapi/issues/27399
+            const { results: logRows, pagination } = await strapi.db.query('admin::audit-log').findPage({
+                ...strapi.get('query-params').transform('admin::audit-log', query),
+                select: [
+                    'id'
+                ]
+            });
+            const ids = logRows.map((log)=>log.id);
+            const logs = ids.length ? await strapi.db.query('admin::audit-log').findMany({
+                where: {
+                    id: {
+                        $in: ids
+                    }
+                },
                 populate: [
                     'user'
                 ],
@@ -37,9 +51,13 @@ const getSanitizedUser = (user)=>{
                     'action',
                     'date',
                     'payload'
-                ],
-                ...strapi.get('query-params').transform('admin::audit-log', query)
-            });
+                ]
+            }) : [];
+            const logsById = new Map(logs.map((log)=>[
+                    log.id,
+                    log
+                ]));
+            const results = ids.map((id)=>logsById.get(id)).filter(Boolean);
             const sanitizedResults = results.map((result)=>{
                 const { user, ...rest } = result;
                 return {

package/dist/server/ee/server/src/audit-logs/services/audit-logs.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"audit-logs.mjs","sources":["../../../../../../../ee/server/src/audit-logs/services/audit-logs.ts"],"sourcesContent":["import type { Core } from '@strapi/types';\n\ninterface Event {\n  action: string;\n  date: Date;\n  userId: string | number;\n  payload: Record<string, unknown>;\n}\n\ninterface Log extends Omit<Event, 'userId'> {\n  user: string | number;\n}\n\nconst getSanitizedUser = (user: any) => {\n  let displayName = user.email;\n\n  if (user.username) {\n    displayName = user.username;\n  } else if (user.firstname && user.lastname) {\n    displayName = `${user.firstname} ${user.lastname}`;\n  }\n\n  return {\n    id: user.id,\n    email: user.email,\n    displayName,\n  };\n};\n\n/**\n * @description\n * Manages audit logs interaction with the database. Accessible via strapi.get('audit-logs')\n */\nconst createAuditLogsService = (strapi: Core.Strapi) => {\n  return {\n    async saveEvent(event: Event) {\n      const { userId, ...rest } = event;\n\n      const auditLog: Log = { ...rest, user: userId };\n\n      // Save to database\n      await strapi.db.query('admin::audit-log').create({ data: auditLog });\n\n      return this;\n    },\n\n    async findMany(query: unknown) {\n      const { results, pagination } = await strapi.db.query('admin::audit-log').findPage({\n        populate: ['user'],\n        select: ['action', 'date', 'payload'],\n        ...strapi.get('query-params').transform('admin::audit-log', query),\n      });\n\n      const sanitizedResults = results.map((result: any) => {\n        const { user, ...rest } = result;\n        return {\n          ...rest,\n          user: user ? getSanitizedUser(user) : null,\n        };\n      });\n\n      return {\n        results: sanitizedResults,\n        pagination,\n      };\n    },\n\n    async findManyUsers(query: { page?: number | string; pageSize?: number | string }) {\n      const { page = 1, pageSize = 10 } = query;\n\n      const userAttribute = strapi.db.metadata.get('admin::audit-log').attributes.user;\n\n      if (\n        userAttribute?.type !== 'relation' ||\n        !('joinTable' in userAttribute) ||\n        !userAttribute.joinTable ||\n        !('inverseJoinColumn' in userAttribute.joinTable)\n      ) {\n        throw new Error('The audit log user relation is expected to use a join table');\n      }\n\n      const { joinTable } = userAttribute;\n\n      const authorIds = await strapi.db\n        .connection(joinTable.name)\n        .distinct(joinTable.inverseJoinColumn.name)\n        .pluck(joinTable.inverseJoinColumn.name);\n\n      const { results, pagination } = await strapi.db.query('admin::user').findPage({\n        select: ['id', 'email', 'username', 'firstname', 'lastname'],\n        where: { id: { $in: authorIds } },\n        orderBy: { id: 'asc' },\n        page: Number(page),\n        pageSize: Number(pageSize),\n      });\n\n      return {\n        results: results.map(getSanitizedUser),\n        pagination,\n      };\n    },\n\n    async findOne(id: unknown) {\n      const result: any = await strapi.db.query('admin::audit-log').findOne({\n        where: { id },\n        populate: ['user'],\n        select: ['action', 'date', 'payload'],\n      });\n\n      if (!result) {\n        return null;\n      }\n\n      const { user, ...rest } = result;\n      return {\n        ...rest,\n        user: user ? getSanitizedUser(user) : null,\n      };\n    },\n\n    deleteExpiredEvents(expirationDate: Date) {\n      return strapi.db.query('admin::audit-log').deleteMany({\n        where: {\n          date: {\n            $lt: expirationDate.toISOString(),\n          },\n        },\n      });\n    },\n  };\n};\n\nexport { createAuditLogsService };\n"],"names":["getSanitizedUser","user","displayName","email","username","firstname","lastname","id","createAuditLogsService","strapi","saveEvent","event","userId","rest","auditLog","db","query","create","data","findMany","results","pagination","findPage","populate","select","get","transform","sanitizedResults","map","result","findManyUsers","page","pageSize","userAttribute","metadata","attributes","type","joinTable","Error","authorIds","connection","name","distinct","inverseJoinColumn","pluck","where","$in","orderBy","Number","findOne","deleteExpiredEvents","expirationDate","deleteMany","date","$lt","toISOString"],"mappings":"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"}
+{"version":3,"file":"audit-logs.mjs","sources":["../../../../../../../ee/server/src/audit-logs/services/audit-logs.ts"],"sourcesContent":["import type { Core } from '@strapi/types';\n\ninterface Event {\n  action: string;\n  date: Date;\n  userId: string | number;\n  payload: Record<string, unknown>;\n}\n\ninterface Log extends Omit<Event, 'userId'> {\n  user: string | number;\n}\n\nconst getSanitizedUser = (user: any) => {\n  let displayName = user.email;\n\n  if (user.username) {\n    displayName = user.username;\n  } else if (user.firstname && user.lastname) {\n    displayName = `${user.firstname} ${user.lastname}`;\n  }\n\n  return {\n    id: user.id,\n    email: user.email,\n    displayName,\n  };\n};\n\n/**\n * @description\n * Manages audit logs interaction with the database. Accessible via strapi.get('audit-logs')\n */\nconst createAuditLogsService = (strapi: Core.Strapi) => {\n  return {\n    async saveEvent(event: Event) {\n      const { userId, ...rest } = event;\n\n      const auditLog: Log = { ...rest, user: userId };\n\n      // Save to database\n      await strapi.db.query('admin::audit-log').create({ data: auditLog });\n\n      return this;\n    },\n\n    async findMany(query: unknown) {\n      // NOTE: We get the IDs first because sorting full rows runs MySQL/MariaDB out of sort memory\n      // See: https://github.com/strapi/strapi/issues/27399\n      const { results: logRows, pagination } = await strapi.db.query('admin::audit-log').findPage({\n        ...strapi.get('query-params').transform('admin::audit-log', query),\n        select: ['id'],\n      });\n\n      const ids = logRows.map((log) => log.id);\n      const logs = ids.length\n        ? await strapi.db.query('admin::audit-log').findMany({\n            where: { id: { $in: ids } },\n            populate: ['user'],\n            select: ['action', 'date', 'payload'],\n          })\n        : [];\n      const logsById = new Map(logs.map((log) => [log.id, log]));\n      const results = ids.map((id) => logsById.get(id)).filter(Boolean);\n\n      const sanitizedResults = results.map((result: any) => {\n        const { user, ...rest } = result;\n        return {\n          ...rest,\n          user: user ? getSanitizedUser(user) : null,\n        };\n      });\n\n      return {\n        results: sanitizedResults,\n        pagination,\n      };\n    },\n\n    async findManyUsers(query: { page?: number | string; pageSize?: number | string }) {\n      const { page = 1, pageSize = 10 } = query;\n\n      const userAttribute = strapi.db.metadata.get('admin::audit-log').attributes.user;\n\n      if (\n        userAttribute?.type !== 'relation' ||\n        !('joinTable' in userAttribute) ||\n        !userAttribute.joinTable ||\n        !('inverseJoinColumn' in userAttribute.joinTable)\n      ) {\n        throw new Error('The audit log user relation is expected to use a join table');\n      }\n\n      const { joinTable } = userAttribute;\n\n      const authorIds = await strapi.db\n        .connection(joinTable.name)\n        .distinct(joinTable.inverseJoinColumn.name)\n        .pluck(joinTable.inverseJoinColumn.name);\n\n      const { results, pagination } = await strapi.db.query('admin::user').findPage({\n        select: ['id', 'email', 'username', 'firstname', 'lastname'],\n        where: { id: { $in: authorIds } },\n        orderBy: { id: 'asc' },\n        page: Number(page),\n        pageSize: Number(pageSize),\n      });\n\n      return {\n        results: results.map(getSanitizedUser),\n        pagination,\n      };\n    },\n\n    async findOne(id: unknown) {\n      const result: any = await strapi.db.query('admin::audit-log').findOne({\n        where: { id },\n        populate: ['user'],\n        select: ['action', 'date', 'payload'],\n      });\n\n      if (!result) {\n        return null;\n      }\n\n      const { user, ...rest } = result;\n      return {\n        ...rest,\n        user: user ? getSanitizedUser(user) : null,\n      };\n    },\n\n    deleteExpiredEvents(expirationDate: Date) {\n      return strapi.db.query('admin::audit-log').deleteMany({\n        where: {\n          date: {\n            $lt: expirationDate.toISOString(),\n          },\n        },\n      });\n    },\n  };\n};\n\nexport { createAuditLogsService };\n"],"names":["getSanitizedUser","user","displayName","email","username","firstname","lastname","id","createAuditLogsService","strapi","saveEvent","event","userId","rest","auditLog","db","query","create","data","findMany","results","logRows","pagination","findPage","get","transform","select","ids","map","log","logs","length","where","$in","populate","logsById","Map","filter","Boolean","sanitizedResults","result","findManyUsers","page","pageSize","userAttribute","metadata","attributes","type","joinTable","Error","authorIds","connection","name","distinct","inverseJoinColumn","pluck","orderBy","Number","findOne","deleteExpiredEvents","expirationDate","deleteMany","date","$lt","toISOString"],"mappings":"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"}

package/dist/server/server/src/controllers/validation/schema.js

@@ -1,27 +1,47 @@
 'use strict';
 
-var zod = require('zod');
+var z = require('zod/v4');
+
+function _interopNamespace(e) {
+  if (e && e.__esModule) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n.default = e;
+  return Object.freeze(n);
+}
+
+var z__namespace = /*#__PURE__*/_interopNamespace(z);
 
 // widths must be one of 4, 6, 8, 12
-const WidthSchema = zod.z.union([
-    zod.z.literal(4),
-    zod.z.literal(6),
-    zod.z.literal(8),
-    zod.z.literal(12)
+const WidthSchema = z__namespace.union([
+    z__namespace.literal(4),
+    z__namespace.literal(6),
+    z__namespace.literal(8),
+    z__namespace.literal(12)
 ]);
-const WidgetEntrySchema = zod.z.object({
-    uid: zod.z.string().nonempty(),
+const WidgetEntrySchema = z__namespace.object({
+    uid: z__namespace.string().nonempty(),
     width: WidthSchema
 }).strict();
-const HomepageLayoutSchema = zod.z.object({
-    version: zod.z.number().int().min(1),
-    widgets: zod.z.array(WidgetEntrySchema).max(100),
-    updatedAt: zod.z.string().datetime()
+const HomepageLayoutSchema = z__namespace.object({
+    version: z__namespace.number().int().min(1),
+    widgets: z__namespace.array(WidgetEntrySchema).max(100),
+    updatedAt: z__namespace.string().datetime()
 }).strict();
-const HomepageLayoutWriteSchema = zod.z.object({
-    version: zod.z.number().int().min(1).optional(),
-    widgets: zod.z.array(WidgetEntrySchema).max(100),
-    updatedAt: zod.z.string().datetime().optional()
+const HomepageLayoutWriteSchema = z__namespace.object({
+    version: z__namespace.number().int().min(1).optional(),
+    widgets: z__namespace.array(WidgetEntrySchema).max(100),
+    updatedAt: z__namespace.string().datetime().optional()
 }).strict();
 
 exports.HomepageLayoutSchema = HomepageLayoutSchema;

package/dist/server/server/src/controllers/validation/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sources":["../../../../../../server/src/controllers/validation/schema.ts"],"sourcesContent":["import { z } from 'zod';\n\n// widths must be one of 4, 6, 8, 12\nexport const WidthSchema = z.union([z.literal(4), z.literal(6), z.literal(8), z.literal(12)]);\n\nconst WidgetEntrySchema = z\n  .object({\n    uid: z.string().nonempty(),\n    width: WidthSchema,\n  })\n  .strict();\n\nexport const HomepageLayoutSchema = z\n  .object({\n    version: z.number().int().min(1),\n    widgets: z.array(WidgetEntrySchema).max(100),\n    updatedAt: z.string().datetime(),\n  })\n  .strict();\n\nexport type HomepageLayout = z.infer<typeof HomepageLayoutSchema>;\n\nexport const HomepageLayoutWriteSchema = z\n  .object({\n    version: z.number().int().min(1).optional(),\n    widgets: z.array(WidgetEntrySchema).max(100),\n    updatedAt: z.string().datetime().optional(),\n  })\n  .strict();\n\nexport type HomepageLayoutWrite = z.infer<typeof HomepageLayoutWriteSchema>;\n"],"names":["WidthSchema","z","union","literal","WidgetEntrySchema","object","uid","string","nonempty","width","strict","HomepageLayoutSchema","version","number","int","min","widgets","array","max","updatedAt","datetime","HomepageLayoutWriteSchema","optional"],"mappings":";;;;AAEA;AACO,MAAMA,WAAAA,GAAcC,KAAAA,CAAEC,KAAK,CAAC;AAACD,IAAAA,KAAAA,CAAEE,OAAO,CAAC,CAAA,CAAA;AAAIF,IAAAA,KAAAA,CAAEE,OAAO,CAAC,CAAA,CAAA;AAAIF,IAAAA,KAAAA,CAAEE,OAAO,CAAC,CAAA,CAAA;AAAIF,IAAAA,KAAAA,CAAEE,OAAO,CAAC,EAAA;CAAI;AAE5F,MAAMC,iBAAAA,GAAoBH,KAAAA,CACvBI,MAAM,CAAC;IACNC,GAAAA,EAAKL,KAAAA,CAAEM,MAAM,EAAA,CAAGC,QAAQ,EAAA;IACxBC,KAAAA,EAAOT;AACT,CAAA,CAAA,CACCU,MAAM,EAAA;AAEF,MAAMC,oBAAAA,GAAuBV,KAAAA,CACjCI,MAAM,CAAC;AACNO,IAAAA,OAAAA,EAASX,MAAEY,MAAM,EAAA,CAAGC,GAAG,EAAA,CAAGC,GAAG,CAAC,CAAA,CAAA;AAC9BC,IAAAA,OAAAA,EAASf,KAAAA,CAAEgB,KAAK,CAACb,iBAAAA,CAAAA,CAAmBc,GAAG,CAAC,GAAA,CAAA;IACxCC,SAAAA,EAAWlB,KAAAA,CAAEM,MAAM,EAAA,CAAGa,QAAQ;AAChC,CAAA,CAAA,CACCV,MAAM;AAIF,MAAMW,yBAAAA,GAA4BpB,KAAAA,CACtCI,MAAM,CAAC;IACNO,OAAAA,EAASX,KAAAA,CAAEY,MAAM,EAAA,CAAGC,GAAG,GAAGC,GAAG,CAAC,GAAGO,QAAQ,EAAA;AACzCN,IAAAA,OAAAA,EAASf,KAAAA,CAAEgB,KAAK,CAACb,iBAAAA,CAAAA,CAAmBc,GAAG,CAAC,GAAA,CAAA;AACxCC,IAAAA,SAAAA,EAAWlB,KAAAA,CAAEM,MAAM,EAAA,CAAGa,QAAQ,GAAGE,QAAQ;AAC3C,CAAA,CAAA,CACCZ,MAAM;;;;;;"}
+{"version":3,"file":"schema.js","sources":["../../../../../../server/src/controllers/validation/schema.ts"],"sourcesContent":["import * as z from 'zod/v4';\n\n// widths must be one of 4, 6, 8, 12\nexport const WidthSchema = z.union([z.literal(4), z.literal(6), z.literal(8), z.literal(12)]);\n\nconst WidgetEntrySchema = z\n  .object({\n    uid: z.string().nonempty(),\n    width: WidthSchema,\n  })\n  .strict();\n\nexport const HomepageLayoutSchema = z\n  .object({\n    version: z.number().int().min(1),\n    widgets: z.array(WidgetEntrySchema).max(100),\n    updatedAt: z.string().datetime(),\n  })\n  .strict();\n\nexport type HomepageLayout = z.infer<typeof HomepageLayoutSchema>;\n\nexport const HomepageLayoutWriteSchema = z\n  .object({\n    version: z.number().int().min(1).optional(),\n    widgets: z.array(WidgetEntrySchema).max(100),\n    updatedAt: z.string().datetime().optional(),\n  })\n  .strict();\n\nexport type HomepageLayoutWrite = z.infer<typeof HomepageLayoutWriteSchema>;\n"],"names":["WidthSchema","z","union","literal","WidgetEntrySchema","object","uid","string","nonempty","width","strict","HomepageLayoutSchema","version","number","int","min","widgets","array","max","updatedAt","datetime","HomepageLayoutWriteSchema","optional"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAEA;AACO,MAAMA,WAAAA,GAAcC,YAAAA,CAAEC,KAAK,CAAC;AAACD,IAAAA,YAAAA,CAAEE,OAAO,CAAC,CAAA,CAAA;AAAIF,IAAAA,YAAAA,CAAEE,OAAO,CAAC,CAAA,CAAA;AAAIF,IAAAA,YAAAA,CAAEE,OAAO,CAAC,CAAA,CAAA;AAAIF,IAAAA,YAAAA,CAAEE,OAAO,CAAC,EAAA;CAAI;AAE5F,MAAMC,iBAAAA,GAAoBH,YAAAA,CACvBI,MAAM,CAAC;IACNC,GAAAA,EAAKL,YAAAA,CAAEM,MAAM,EAAA,CAAGC,QAAQ,EAAA;IACxBC,KAAAA,EAAOT;AACT,CAAA,CAAA,CACCU,MAAM,EAAA;AAEF,MAAMC,oBAAAA,GAAuBV,YAAAA,CACjCI,MAAM,CAAC;AACNO,IAAAA,OAAAA,EAASX,aAAEY,MAAM,EAAA,CAAGC,GAAG,EAAA,CAAGC,GAAG,CAAC,CAAA,CAAA;AAC9BC,IAAAA,OAAAA,EAASf,YAAAA,CAAEgB,KAAK,CAACb,iBAAAA,CAAAA,CAAmBc,GAAG,CAAC,GAAA,CAAA;IACxCC,SAAAA,EAAWlB,YAAAA,CAAEM,MAAM,EAAA,CAAGa,QAAQ;AAChC,CAAA,CAAA,CACCV,MAAM;AAIF,MAAMW,yBAAAA,GAA4BpB,YAAAA,CACtCI,MAAM,CAAC;IACNO,OAAAA,EAASX,YAAAA,CAAEY,MAAM,EAAA,CAAGC,GAAG,GAAGC,GAAG,CAAC,GAAGO,QAAQ,EAAA;AACzCN,IAAAA,OAAAA,EAASf,YAAAA,CAAEgB,KAAK,CAACb,iBAAAA,CAAAA,CAAmBc,GAAG,CAAC,GAAA,CAAA;AACxCC,IAAAA,SAAAA,EAAWlB,YAAAA,CAAEM,MAAM,EAAA,CAAGa,QAAQ,GAAGE,QAAQ;AAC3C,CAAA,CAAA,CACCZ,MAAM;;;;;;"}

package/dist/server/server/src/controllers/validation/schema.mjs

@@ -1,4 +1,4 @@
-import { z } from 'zod';
+import * as z from 'zod/v4';
 
 // widths must be one of 4, 6, 8, 12
 const WidthSchema = z.union([

package/dist/server/server/src/controllers/validation/schema.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"schema.mjs","sources":["../../../../../../server/src/controllers/validation/schema.ts"],"sourcesContent":["import { z } from 'zod';\n\n// widths must be one of 4, 6, 8, 12\nexport const WidthSchema = z.union([z.literal(4), z.literal(6), z.literal(8), z.literal(12)]);\n\nconst WidgetEntrySchema = z\n  .object({\n    uid: z.string().nonempty(),\n    width: WidthSchema,\n  })\n  .strict();\n\nexport const HomepageLayoutSchema = z\n  .object({\n    version: z.number().int().min(1),\n    widgets: z.array(WidgetEntrySchema).max(100),\n    updatedAt: z.string().datetime(),\n  })\n  .strict();\n\nexport type HomepageLayout = z.infer<typeof HomepageLayoutSchema>;\n\nexport const HomepageLayoutWriteSchema = z\n  .object({\n    version: z.number().int().min(1).optional(),\n    widgets: z.array(WidgetEntrySchema).max(100),\n    updatedAt: z.string().datetime().optional(),\n  })\n  .strict();\n\nexport type HomepageLayoutWrite = z.infer<typeof HomepageLayoutWriteSchema>;\n"],"names":["WidthSchema","z","union","literal","WidgetEntrySchema","object","uid","string","nonempty","width","strict","HomepageLayoutSchema","version","number","int","min","widgets","array","max","updatedAt","datetime","HomepageLayoutWriteSchema","optional"],"mappings":";;AAEA;AACO,MAAMA,WAAAA,GAAcC,CAAAA,CAAEC,KAAK,CAAC;AAACD,IAAAA,CAAAA,CAAEE,OAAO,CAAC,CAAA,CAAA;AAAIF,IAAAA,CAAAA,CAAEE,OAAO,CAAC,CAAA,CAAA;AAAIF,IAAAA,CAAAA,CAAEE,OAAO,CAAC,CAAA,CAAA;AAAIF,IAAAA,CAAAA,CAAEE,OAAO,CAAC,EAAA;CAAI;AAE5F,MAAMC,iBAAAA,GAAoBH,CAAAA,CACvBI,MAAM,CAAC;IACNC,GAAAA,EAAKL,CAAAA,CAAEM,MAAM,EAAA,CAAGC,QAAQ,EAAA;IACxBC,KAAAA,EAAOT;AACT,CAAA,CAAA,CACCU,MAAM,EAAA;AAEF,MAAMC,oBAAAA,GAAuBV,CAAAA,CACjCI,MAAM,CAAC;AACNO,IAAAA,OAAAA,EAASX,EAAEY,MAAM,EAAA,CAAGC,GAAG,EAAA,CAAGC,GAAG,CAAC,CAAA,CAAA;AAC9BC,IAAAA,OAAAA,EAASf,CAAAA,CAAEgB,KAAK,CAACb,iBAAAA,CAAAA,CAAmBc,GAAG,CAAC,GAAA,CAAA;IACxCC,SAAAA,EAAWlB,CAAAA,CAAEM,MAAM,EAAA,CAAGa,QAAQ;AAChC,CAAA,CAAA,CACCV,MAAM;AAIF,MAAMW,yBAAAA,GAA4BpB,CAAAA,CACtCI,MAAM,CAAC;IACNO,OAAAA,EAASX,CAAAA,CAAEY,MAAM,EAAA,CAAGC,GAAG,GAAGC,GAAG,CAAC,GAAGO,QAAQ,EAAA;AACzCN,IAAAA,OAAAA,EAASf,CAAAA,CAAEgB,KAAK,CAACb,iBAAAA,CAAAA,CAAmBc,GAAG,CAAC,GAAA,CAAA;AACxCC,IAAAA,SAAAA,EAAWlB,CAAAA,CAAEM,MAAM,EAAA,CAAGa,QAAQ,GAAGE,QAAQ;AAC3C,CAAA,CAAA,CACCZ,MAAM;;;;"}
+{"version":3,"file":"schema.mjs","sources":["../../../../../../server/src/controllers/validation/schema.ts"],"sourcesContent":["import * as z from 'zod/v4';\n\n// widths must be one of 4, 6, 8, 12\nexport const WidthSchema = z.union([z.literal(4), z.literal(6), z.literal(8), z.literal(12)]);\n\nconst WidgetEntrySchema = z\n  .object({\n    uid: z.string().nonempty(),\n    width: WidthSchema,\n  })\n  .strict();\n\nexport const HomepageLayoutSchema = z\n  .object({\n    version: z.number().int().min(1),\n    widgets: z.array(WidgetEntrySchema).max(100),\n    updatedAt: z.string().datetime(),\n  })\n  .strict();\n\nexport type HomepageLayout = z.infer<typeof HomepageLayoutSchema>;\n\nexport const HomepageLayoutWriteSchema = z\n  .object({\n    version: z.number().int().min(1).optional(),\n    widgets: z.array(WidgetEntrySchema).max(100),\n    updatedAt: z.string().datetime().optional(),\n  })\n  .strict();\n\nexport type HomepageLayoutWrite = z.infer<typeof HomepageLayoutWriteSchema>;\n"],"names":["WidthSchema","z","union","literal","WidgetEntrySchema","object","uid","string","nonempty","width","strict","HomepageLayoutSchema","version","number","int","min","widgets","array","max","updatedAt","datetime","HomepageLayoutWriteSchema","optional"],"mappings":";;AAEA;AACO,MAAMA,WAAAA,GAAcC,CAAAA,CAAEC,KAAK,CAAC;AAACD,IAAAA,CAAAA,CAAEE,OAAO,CAAC,CAAA,CAAA;AAAIF,IAAAA,CAAAA,CAAEE,OAAO,CAAC,CAAA,CAAA;AAAIF,IAAAA,CAAAA,CAAEE,OAAO,CAAC,CAAA,CAAA;AAAIF,IAAAA,CAAAA,CAAEE,OAAO,CAAC,EAAA;CAAI;AAE5F,MAAMC,iBAAAA,GAAoBH,CAAAA,CACvBI,MAAM,CAAC;IACNC,GAAAA,EAAKL,CAAAA,CAAEM,MAAM,EAAA,CAAGC,QAAQ,EAAA;IACxBC,KAAAA,EAAOT;AACT,CAAA,CAAA,CACCU,MAAM,EAAA;AAEF,MAAMC,oBAAAA,GAAuBV,CAAAA,CACjCI,MAAM,CAAC;AACNO,IAAAA,OAAAA,EAASX,EAAEY,MAAM,EAAA,CAAGC,GAAG,EAAA,CAAGC,GAAG,CAAC,CAAA,CAAA;AAC9BC,IAAAA,OAAAA,EAASf,CAAAA,CAAEgB,KAAK,CAACb,iBAAAA,CAAAA,CAAmBc,GAAG,CAAC,GAAA,CAAA;IACxCC,SAAAA,EAAWlB,CAAAA,CAAEM,MAAM,EAAA,CAAGa,QAAQ;AAChC,CAAA,CAAA,CACCV,MAAM;AAIF,MAAMW,yBAAAA,GAA4BpB,CAAAA,CACtCI,MAAM,CAAC;IACNO,OAAAA,EAASX,CAAAA,CAAEY,MAAM,EAAA,CAAGC,GAAG,GAAGC,GAAG,CAAC,GAAGO,QAAQ,EAAA;AACzCN,IAAAA,OAAAA,EAASf,CAAAA,CAAEgB,KAAK,CAACb,iBAAAA,CAAAA,CAAmBc,GAAG,CAAC,GAAA,CAAA;AACxCC,IAAAA,SAAAA,EAAWlB,CAAAA,CAAEM,MAAM,EAAA,CAAGa,QAAQ,GAAGE,QAAQ;AAC3C,CAAA,CAAA,CACCZ,MAAM;;;;"}

package/dist/server/server/src/services/content-type.js

@@ -96,6 +96,7 @@ var ___default = /*#__PURE__*/_interopDefault(_);
  * Cleans permissions' fields (add required ones, remove the non-existing ones)
  */ const cleanPermissionFields = (permissions)=>{
     const { actionProvider } = index.getService('permission');
+    const nestedFieldsCache = new Map();
     return permissions.map((permission)=>{
         const { action: actionId, subject, properties: { fields } } = permission;
         const action = actionProvider.get(actionId);
@@ -106,9 +107,13 @@ var ___default = /*#__PURE__*/_interopDefault(_);
         if (!subject || !strapi.contentTypes[subject]) {
             return permission;
         }
-        const possibleFields = getNestedFieldsWithIntermediate(strapi.contentTypes[subject], {
-            components: strapi.components
-        });
+        let possibleFields = nestedFieldsCache.get(subject);
+        if (!possibleFields) {
+            possibleFields = getNestedFieldsWithIntermediate(strapi.contentTypes[subject], {
+                components: strapi.components
+            });
+            nestedFieldsCache.set(subject, possibleFields);
+        }
         const currentFields = fields || [];
         const validUserFields = fp.uniq(possibleFields.filter((pf)=>currentFields.some((cf)=>pf === cf || fp.startsWith(`${cf}.`, pf))));
         // A field is considered "not nested" if no other valid user field starts with this field's path followed by a dot.

package/dist/server/server/src/services/content-type.js.map

@@ -1 +1 @@
-{"version":3,"file":"content-type.js","sources":["../../../../../server/src/services/content-type.ts"],"sourcesContent":["import _ from 'lodash';\nimport { uniq, startsWith } from 'lodash/fp';\nimport { contentTypes as contentTypesUtils } from '@strapi/utils';\nimport type { Modules, Struct } from '@strapi/types';\nimport { getService } from '../utils';\nimport actionDomain from '../domain/action';\nimport permissionDomain from '../domain/permission';\n\ninterface FieldOptions {\n  prefix?: string; // prefix to add to the path\n  nestingLevel?: number; // level of nesting to achieve\n  requiredOnly?: boolean; // only returns required nestedFields\n  existingFields?: string[]; // fields that are already selected, meaning that some sub-fields may be required\n  restrictedSubjects?: string[]; // subjectsId to ignore\n  components?: {\n    // components where components attributes can be found\n    [key: string]: any;\n  };\n}\n\n/**\n * Creates an array of paths to the fields and nested fields, without path nodes\n */\nconst getNestedFields = (\n  model: Struct.ContentTypeSchema,\n  {\n    prefix = '',\n    nestingLevel = 15,\n    components = {},\n    requiredOnly = false,\n    existingFields = [],\n  }: FieldOptions\n): string[] => {\n  if (nestingLevel === 0) {\n    return prefix ? [prefix] : [];\n  }\n\n  const nonAuthorizableFields = contentTypesUtils.getNonVisibleAttributes(model);\n\n  return _.reduce(\n    model.attributes,\n    (fields: any, attr: any, key: any) => {\n      if (nonAuthorizableFields.includes(key)) return fields;\n\n      const fieldPath = prefix ? `${prefix}.${key}` : key;\n      const shouldBeIncluded = !requiredOnly || attr.required === true;\n      const insideExistingFields = existingFields && existingFields.some(startsWith(fieldPath));\n\n      if (attr.type === 'component') {\n        if (shouldBeIncluded || insideExistingFields) {\n          const compoFields = getNestedFields(components[attr.component], {\n            nestingLevel: nestingLevel - 1,\n            prefix: fieldPath,\n            components,\n            requiredOnly,\n            existingFields,\n          });\n\n          if (compoFields.length === 0 && shouldBeIncluded) {\n            return fields.concat(fieldPath);\n          }\n\n          return fields.concat(compoFields);\n        }\n        return fields;\n      }\n\n      if (shouldBeIncluded) {\n        return fields.concat(fieldPath);\n      }\n\n      return fields;\n    },\n    []\n  );\n};\n\n/**\n * Creates an array of paths to the fields and nested fields, with path nodes\n */\nconst getNestedFieldsWithIntermediate = (\n  model: Struct.ContentTypeSchema,\n  { prefix = '', nestingLevel = 15, components = {} }: FieldOptions\n): string[] => {\n  if (nestingLevel === 0) {\n    return [];\n  }\n\n  const nonAuthorizableFields = contentTypesUtils.getNonVisibleAttributes(model);\n\n  return _.reduce(\n    model.attributes,\n    (fields: any, attr: any, key: any) => {\n      if (nonAuthorizableFields.includes(key)) return fields;\n\n      const fieldPath = prefix ? `${prefix}.${key}` : key;\n      fields.push(fieldPath);\n\n      if (attr.type === 'component') {\n        const compoFields = getNestedFieldsWithIntermediate(components[attr.component], {\n          nestingLevel: nestingLevel - 1,\n          prefix: fieldPath,\n          components,\n        });\n\n        fields.push(...compoFields);\n      }\n\n      return fields;\n    },\n    []\n  );\n};\n\n/**\n * Creates an array of permissions with the \"properties.fields\" attribute filled\n */\nconst getPermissionsWithNestedFields = (\n  actions: any[],\n  { nestingLevel, restrictedSubjects = [] }: FieldOptions = {}\n): Modules.Permissions.PermissionRule[] => {\n  return actions.reduce((permissions, action) => {\n    const validSubjects = action.subjects.filter(\n      (subject: any) => !restrictedSubjects.includes(subject)\n    );\n\n    // Create a Permission for each subject (content-type uid) within the action\n    for (const subject of validSubjects) {\n      const fields = actionDomain.appliesToProperty('fields', action)\n        ? getNestedFields(strapi.contentTypes[subject], {\n            components: strapi.components,\n            nestingLevel,\n          })\n        : undefined;\n\n      const permission = permissionDomain.create({\n        action: action.actionId,\n        subject,\n        properties: { fields },\n      });\n\n      permissions.push(permission);\n    }\n\n    return permissions;\n  }, []);\n};\n\n/**\n * Cleans permissions' fields (add required ones, remove the non-existing ones)\n */\nconst cleanPermissionFields = (\n  permissions: Modules.Permissions.PermissionRule[]\n): Modules.Permissions.PermissionRule[] => {\n  const { actionProvider } = getService('permission');\n\n  return permissions.map((permission: any) => {\n    const {\n      action: actionId,\n      subject,\n      properties: { fields },\n    } = permission;\n\n    const action = actionProvider.get(actionId) as any;\n\n    // todo see if it's possible to check property on action + subject (async)\n    if (!actionDomain.appliesToProperty('fields', action)) {\n      return permissionDomain.deleteProperty('fields', permission);\n    }\n\n    if (!subject || !strapi.contentTypes[subject]) {\n      return permission;\n    }\n\n    const possibleFields = getNestedFieldsWithIntermediate(strapi.contentTypes[subject], {\n      components: strapi.components,\n    });\n\n    const currentFields: string[] = fields || [];\n\n    const validUserFields: string[] = uniq(\n      possibleFields.filter((pf) =>\n        currentFields.some((cf) => pf === cf || startsWith(`${cf}.`, pf))\n      )\n    );\n\n    // A field is considered \"not nested\" if no other valid user field starts with this field's path followed by a dot.\n    // This helps to remove redundant parent paths when a more specific child path is already included.\n    // For example, if 'component.title' is present, 'component' would be filtered out by this condition.\n    const isNotNestedField = (field: string) =>\n      !validUserFields.some(\n        (validUserField: string) =>\n          validUserField !== field && startsWith(`${field}.`, validUserField)\n      );\n\n    // Filter out fields that are parent paths of other included fields.\n    const newFields = validUserFields.filter(isNotNestedField);\n\n    return permissionDomain.setProperty('fields', newFields, permission);\n  }, []);\n};\n\nexport {\n  getNestedFields,\n  getPermissionsWithNestedFields,\n  cleanPermissionFields,\n  getNestedFieldsWithIntermediate,\n};\n"],"names":["getNestedFields","model","prefix","nestingLevel","components","requiredOnly","existingFields","nonAuthorizableFields","contentTypesUtils","getNonVisibleAttributes","_","reduce","attributes","fields","attr","key","includes","fieldPath","shouldBeIncluded","required","insideExistingFields","some","startsWith","type","compoFields","component","length","concat","getNestedFieldsWithIntermediate","push","getPermissionsWithNestedFields","actions","restrictedSubjects","permissions","action","validSubjects","subjects","filter","subject","actionDomain","appliesToProperty","strapi","contentTypes","undefined","permission","permissionDomain","create","actionId","properties","cleanPermissionFields","actionProvider","getService","map","get","deleteProperty","possibleFields","currentFields","validUserFields","uniq","pf","cf","isNotNestedField","field","validUserField","newFields","setProperty"],"mappings":"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"}
+{"version":3,"file":"content-type.js","sources":["../../../../../server/src/services/content-type.ts"],"sourcesContent":["import _ from 'lodash';\nimport { uniq, startsWith } from 'lodash/fp';\nimport { contentTypes as contentTypesUtils } from '@strapi/utils';\nimport type { Modules, Struct } from '@strapi/types';\nimport { getService } from '../utils';\nimport actionDomain from '../domain/action';\nimport permissionDomain from '../domain/permission';\n\ninterface FieldOptions {\n  prefix?: string; // prefix to add to the path\n  nestingLevel?: number; // level of nesting to achieve\n  requiredOnly?: boolean; // only returns required nestedFields\n  existingFields?: string[]; // fields that are already selected, meaning that some sub-fields may be required\n  restrictedSubjects?: string[]; // subjectsId to ignore\n  components?: {\n    // components where components attributes can be found\n    [key: string]: any;\n  };\n}\n\n/**\n * Creates an array of paths to the fields and nested fields, without path nodes\n */\nconst getNestedFields = (\n  model: Struct.ContentTypeSchema,\n  {\n    prefix = '',\n    nestingLevel = 15,\n    components = {},\n    requiredOnly = false,\n    existingFields = [],\n  }: FieldOptions\n): string[] => {\n  if (nestingLevel === 0) {\n    return prefix ? [prefix] : [];\n  }\n\n  const nonAuthorizableFields = contentTypesUtils.getNonVisibleAttributes(model);\n\n  return _.reduce(\n    model.attributes,\n    (fields: any, attr: any, key: any) => {\n      if (nonAuthorizableFields.includes(key)) return fields;\n\n      const fieldPath = prefix ? `${prefix}.${key}` : key;\n      const shouldBeIncluded = !requiredOnly || attr.required === true;\n      const insideExistingFields = existingFields && existingFields.some(startsWith(fieldPath));\n\n      if (attr.type === 'component') {\n        if (shouldBeIncluded || insideExistingFields) {\n          const compoFields = getNestedFields(components[attr.component], {\n            nestingLevel: nestingLevel - 1,\n            prefix: fieldPath,\n            components,\n            requiredOnly,\n            existingFields,\n          });\n\n          if (compoFields.length === 0 && shouldBeIncluded) {\n            return fields.concat(fieldPath);\n          }\n\n          return fields.concat(compoFields);\n        }\n        return fields;\n      }\n\n      if (shouldBeIncluded) {\n        return fields.concat(fieldPath);\n      }\n\n      return fields;\n    },\n    []\n  );\n};\n\n/**\n * Creates an array of paths to the fields and nested fields, with path nodes\n */\nconst getNestedFieldsWithIntermediate = (\n  model: Struct.ContentTypeSchema,\n  { prefix = '', nestingLevel = 15, components = {} }: FieldOptions\n): string[] => {\n  if (nestingLevel === 0) {\n    return [];\n  }\n\n  const nonAuthorizableFields = contentTypesUtils.getNonVisibleAttributes(model);\n\n  return _.reduce(\n    model.attributes,\n    (fields: any, attr: any, key: any) => {\n      if (nonAuthorizableFields.includes(key)) return fields;\n\n      const fieldPath = prefix ? `${prefix}.${key}` : key;\n      fields.push(fieldPath);\n\n      if (attr.type === 'component') {\n        const compoFields = getNestedFieldsWithIntermediate(components[attr.component], {\n          nestingLevel: nestingLevel - 1,\n          prefix: fieldPath,\n          components,\n        });\n\n        fields.push(...compoFields);\n      }\n\n      return fields;\n    },\n    []\n  );\n};\n\n/**\n * Creates an array of permissions with the \"properties.fields\" attribute filled\n */\nconst getPermissionsWithNestedFields = (\n  actions: any[],\n  { nestingLevel, restrictedSubjects = [] }: FieldOptions = {}\n): Modules.Permissions.PermissionRule[] => {\n  return actions.reduce((permissions, action) => {\n    const validSubjects = action.subjects.filter(\n      (subject: any) => !restrictedSubjects.includes(subject)\n    );\n\n    // Create a Permission for each subject (content-type uid) within the action\n    for (const subject of validSubjects) {\n      const fields = actionDomain.appliesToProperty('fields', action)\n        ? getNestedFields(strapi.contentTypes[subject], {\n            components: strapi.components,\n            nestingLevel,\n          })\n        : undefined;\n\n      const permission = permissionDomain.create({\n        action: action.actionId,\n        subject,\n        properties: { fields },\n      });\n\n      permissions.push(permission);\n    }\n\n    return permissions;\n  }, []);\n};\n\n/**\n * Cleans permissions' fields (add required ones, remove the non-existing ones)\n */\nconst cleanPermissionFields = (\n  permissions: Modules.Permissions.PermissionRule[]\n): Modules.Permissions.PermissionRule[] => {\n  const { actionProvider } = getService('permission');\n  const nestedFieldsCache = new Map<string, string[]>();\n\n  return permissions.map((permission: any) => {\n    const {\n      action: actionId,\n      subject,\n      properties: { fields },\n    } = permission;\n\n    const action = actionProvider.get(actionId) as any;\n\n    // todo see if it's possible to check property on action + subject (async)\n    if (!actionDomain.appliesToProperty('fields', action)) {\n      return permissionDomain.deleteProperty('fields', permission);\n    }\n\n    if (!subject || !strapi.contentTypes[subject]) {\n      return permission;\n    }\n\n    let possibleFields = nestedFieldsCache.get(subject);\n    if (!possibleFields) {\n      possibleFields = getNestedFieldsWithIntermediate(strapi.contentTypes[subject], {\n        components: strapi.components,\n      });\n      nestedFieldsCache.set(subject, possibleFields);\n    }\n\n    const currentFields: string[] = fields || [];\n\n    const validUserFields: string[] = uniq(\n      possibleFields.filter((pf) =>\n        currentFields.some((cf) => pf === cf || startsWith(`${cf}.`, pf))\n      )\n    );\n\n    // A field is considered \"not nested\" if no other valid user field starts with this field's path followed by a dot.\n    // This helps to remove redundant parent paths when a more specific child path is already included.\n    // For example, if 'component.title' is present, 'component' would be filtered out by this condition.\n    const isNotNestedField = (field: string) =>\n      !validUserFields.some(\n        (validUserField: string) =>\n          validUserField !== field && startsWith(`${field}.`, validUserField)\n      );\n\n    // Filter out fields that are parent paths of other included fields.\n    const newFields = validUserFields.filter(isNotNestedField);\n\n    return permissionDomain.setProperty('fields', newFields, permission);\n  }, []);\n};\n\nexport {\n  getNestedFields,\n  getPermissionsWithNestedFields,\n  cleanPermissionFields,\n  getNestedFieldsWithIntermediate,\n};\n"],"names":["getNestedFields","model","prefix","nestingLevel","components","requiredOnly","existingFields","nonAuthorizableFields","contentTypesUtils","getNonVisibleAttributes","_","reduce","attributes","fields","attr","key","includes","fieldPath","shouldBeIncluded","required","insideExistingFields","some","startsWith","type","compoFields","component","length","concat","getNestedFieldsWithIntermediate","push","getPermissionsWithNestedFields","actions","restrictedSubjects","permissions","action","validSubjects","subjects","filter","subject","actionDomain","appliesToProperty","strapi","contentTypes","undefined","permission","permissionDomain","create","actionId","properties","cleanPermissionFields","actionProvider","getService","nestedFieldsCache","Map","map","get","deleteProperty","possibleFields","set","currentFields","validUserFields","uniq","pf","cf","isNotNestedField","field","validUserField","newFields","setProperty"],"mappings":"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"}