@diphyx/harlemify 6.0.0 → 6.1.0

package/dist/module.json

@@ -4,7 +4,7 @@
   "compatibility": {
     "nuxt": "^3.14.0 || ^4.0.0"
   },
-  "version": "6.0.0",
+  "version": "6.1.0",
   "builder": {
     "@nuxt/module-builder": "0.8.4",
     "unbuild": "unknown"

package/dist/runtime/core/layers/shape.d.ts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import type { ShapeFactory, ShapeRawDefinition } from "../types/shape.js";
+import type { ShapeCall, ShapeFactory, ShapeRawDefinition } from "../types/shape.js";
 export declare const primitiveField: {
     string: typeof z.string;
     number: typeof z.number;
@@ -42,4 +42,17 @@ export declare const specialField: {
     nullable: typeof z.nullable;
     optional: typeof z.optional;
 };
-export declare function shape<T extends ShapeRawDefinition>(definition: T | ((factory: ShapeFactory) => T)): import("../types/shape").ShapeCall<T>;
+declare function shapeFn<T extends ShapeRawDefinition>(definition: T | z.ZodObject<T> | ((factory: ShapeFactory) => T)): ShapeCall<T>;
+declare function shapeExtend<B extends ShapeRawDefinition, E extends ShapeRawDefinition>(base: ShapeCall<B>, extension: E): ShapeCall<B & E>;
+declare function shapePick<B extends ShapeRawDefinition, M extends {
+    [K in keyof B]?: true;
+}>(base: ShapeCall<B>, mask: M): ShapeCall<Pick<B, Extract<keyof B, keyof M>>>;
+declare function shapeOmit<B extends ShapeRawDefinition, M extends {
+    [K in keyof B]?: true;
+}>(base: ShapeCall<B>, mask: M): ShapeCall<Omit<B, Extract<keyof B, keyof M>>>;
+export declare const shape: typeof shapeFn & {
+    extend: typeof shapeExtend;
+    pick: typeof shapePick;
+    omit: typeof shapeOmit;
+};
+export {};

package/dist/runtime/core/layers/shape.js

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { createShape } from "../utils/shape.js";
+import { createShape, decorateShape } from "../utils/shape.js";
 export const primitiveField = {
   string: z.string,
   number: z.number,
@@ -42,16 +42,32 @@ export const specialField = {
   nullable: z.nullable,
   optional: z.optional
 };
-export function shape(definition) {
+const factory = {
+  ...primitiveField,
+  ...structureField,
+  ...formatField,
+  ...specialField
+};
+function shapeFn(definition) {
+  if (definition instanceof z.ZodObject) {
+    return decorateShape(definition);
+  }
   if (typeof definition === "function") {
-    return createShape(
-      definition({
-        ...primitiveField,
-        ...structureField,
-        ...formatField,
-        ...specialField
-      })
-    );
+    return createShape(definition(factory));
   }
   return createShape(definition);
 }
+function shapeExtend(base, extension) {
+  return decorateShape(base.extend(extension));
+}
+function shapePick(base, mask) {
+  return decorateShape(base.pick(mask));
+}
+function shapeOmit(base, mask) {
+  return decorateShape(base.omit(mask));
+}
+export const shape = Object.assign(shapeFn, {
+  extend: shapeExtend,
+  pick: shapePick,
+  omit: shapeOmit
+});

package/dist/runtime/core/utils/shape.d.ts

@@ -1,7 +1,9 @@
+import { z } from "zod";
 import type { ShapeCall, ShapeDefinition, ShapeInfer, ShapeRawDefinition, ShapeType } from "../types/shape.js";
 export declare function resolveAliasInbound<T = unknown>(data: T, aliases?: Record<string, string>): T;
 export declare function resolveAliasOutbound<T = unknown>(data: T, aliases?: Record<string, string>): T;
 export declare function resolveShapeIdentifier(shape: ShapeType<unknown>, ...overrides: (string | undefined)[]): string;
 export declare function resolveShapeAliases(shape: ShapeType<unknown>): Record<string, string>;
 export declare function resolveZeroValues<T extends ShapeDefinition>(shape: T): ShapeInfer<T>;
+export declare function decorateShape<T extends ShapeRawDefinition>(object: z.ZodObject<T>): ShapeCall<T>;
 export declare function createShape<T extends ShapeRawDefinition>(definition: T): ShapeCall<T>;

package/dist/runtime/core/utils/shape.js

@@ -178,8 +178,7 @@ export function resolveZeroValues(shape) {
   }
   return output;
 }
-export function createShape(definition) {
-  const object = z.object(definition);
+export function decorateShape(object) {
   const shape = Object.assign(object, {
     defaults(overrides) {
       const zero = resolveZeroValues(object);
@@ -191,3 +190,7 @@ export function createShape(definition) {
   });
   return shape;
 }
+export function createShape(definition) {
+  const object = z.object(definition);
+  return decorateShape(object);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@diphyx/harlemify",
-    "version": "6.0.0",
+    "version": "6.1.0",
     "description": "API state management for Nuxt powered by Harlem",
     "keywords": [
         "nuxt",