simple-strapi 1.0.0-alpha.2 → 1.0.0-alpha.3

package/dist/client.d.ts

@@ -1,6 +1,6 @@
 import { InferNumber, NumberField, NumberOptions } from "./fields/number";
 import { InferText, TextField, TextOptions } from "./fields/text";
-import { InferRelationHasMany, RelationHasManyField, RelationHasManyOptions } from "./fields/relation";
+import { InferRelationHasMany, InferRelationHasOne, RelationHasManyField, RelationHasManyOptions, RelationHasOneField, RelationHasOneOptions } from "./fields/relation";
 import { DynamicField, DynamicOptions, InferDynamic } from "./fields/dynamic";
 import { ComponentRepeatableField, ComponentRepeatableOptions, ComponentSingleField, ComponentSingleOptions, InferComponentRepeatable, InferComponentSingle } from "./fields/component";
 import { InferMediaSingle, MediaSingleField, MediaSingleOptions } from "./fields/media";
@@ -11,7 +11,7 @@ type EntityRequest<P = {}> = {
     params?: RequestParams;
     headers?: Record<string, string>;
 } & P;
-export type SchemaField = TextField | NumberField | RelationHasManyField | DynamicField | ComponentSingleField | ComponentRepeatableField | MediaSingleField | EnumerationField | RichTextBlocksField;
+export type SchemaField = TextField | NumberField | RelationHasManyField | RelationHasOneField | DynamicField | ComponentSingleField | ComponentRepeatableField | MediaSingleField | EnumerationField | RichTextBlocksField;
 export type Schema = Record<string, SchemaField>;
 export type InferSchema<S extends Schema> = {
     [K in keyof S]: S[K] extends ["text", infer O extends TextOptions] ? InferText<O> : S[K] extends ["number", infer O extends NumberOptions] ? InferNumber<O> : S[K] extends [
@@ -19,6 +19,10 @@ export type InferSchema<S extends Schema> = {
         infer R extends Schema,
         infer O extends RelationHasManyOptions
     ] ? InferRelationHasMany<R, O> : S[K] extends [
+        "relation.hasOne",
+        infer R extends Schema,
+        infer O extends RelationHasOneOptions
+    ] ? InferRelationHasOne<R, O> : S[K] extends [
         "component.single",
         infer R extends Schema,
         infer O extends ComponentSingleOptions

package/dist/client.js

@@ -1,4 +1,4 @@
-import { createSimpleException, isSimpleExceptionOrFallback } from "@hund-ernesto/simple-exception";
+import { createSimpleException, ensureSimpleException } from "simple-exception";
 import { join } from "path";
 import fetch from "node-fetch";
 import qs from "qs";
@@ -50,7 +50,7 @@ class Client {
             return token;
         }
         catch (exception) {
-            throw isSimpleExceptionOrFallback(exception);
+            throw ensureSimpleException(exception);
         }
     }
     constructor(options) {
@@ -68,6 +68,9 @@ class Client {
             const populateHasManyRelation = ([, shape]) => {
                 return this.populateFromSchema(shape);
             };
+            const populateHasOneRelation = ([, shape]) => {
+                return this.populateFromSchema(shape);
+            };
             const populateComponentSingle = ([, shape]) => {
                 return this.populateFromSchema(shape);
             };
@@ -91,6 +94,11 @@ class Client {
                         if (!Object.keys(populate[key].populate)["length"])
                             populate[key] = true;
                         break;
+                    case "relation.hasOne":
+                        populate[key] = { populate: populateHasOneRelation(field) };
+                        if (!Object.keys(populate[key].populate)["length"])
+                            populate[key] = true;
+                        break;
                     case "component.single":
                         populate[key] = { populate: populateComponentSingle(field) };
                         if (!Object.keys(populate[key].populate)["length"])
@@ -161,7 +169,9 @@ class Client {
                     source: "strapi-utils/client.ts",
                 });
             }
-            const { data: [data], meta, } = z.object({ data: z.array(z.any()), meta: z.any() }).parse(await response.json());
+            const { data, meta } = z
+                .object({ data: z.any(), meta: z.any() })
+                .parse(await response.json());
             if (!data)
                 throw createSimpleException({ code: 404, type: "error", message: "Not found" });
             if ("schema" in options) {
@@ -180,7 +190,7 @@ class Client {
             return { data, meta };
         }
         catch (exception) {
-            throw isSimpleExceptionOrFallback(exception);
+            throw ensureSimpleException(exception);
         }
     }
     async getCollection(pluralID, { params = {}, headers = {}, pagination = { page: 1 }, ...options } = {}) {
@@ -245,7 +255,7 @@ class Client {
                             parsedData.push(result.data);
                         }
                         else {
-                            console.warn("⚠️ Collection parsing error on entry");
+                            console.warn("⚠️ Collection parsing error on entry", entry);
                             console.error("🚨 Error", result.error);
                         }
                     }
@@ -255,7 +265,7 @@ class Client {
             return { data, meta };
         }
         catch (exception) {
-            throw isSimpleExceptionOrFallback(exception);
+            throw ensureSimpleException(exception);
         }
     }
 }

package/dist/fields/relation.d.ts

@@ -1,10 +1,23 @@
 import { InferSchema, Schema } from "../client";
+/**
+ * HAS MANY
+ */
 export type RelationHasManyOptions = {
     nullable?: boolean;
     optional?: boolean;
 };
 export type InferRelationHasMany<S extends Schema, O extends RelationHasManyOptions> = O["nullable"] extends true ? O["optional"] extends true ? InferSchema<S>[] | null | undefined : InferSchema<S>[] | null : O["optional"] extends true ? InferSchema<S>[] | undefined : InferSchema<S>[];
 export type RelationHasManyField = readonly ["relation.hasMany", Schema, RelationHasManyOptions];
+/**
+ * HAS ONE
+ */
+export type RelationHasOneOptions = {
+    nullable?: boolean;
+    optional?: boolean;
+};
+export type InferRelationHasOne<S extends Schema, O extends RelationHasOneOptions> = O["nullable"] extends true ? O["optional"] extends true ? InferSchema<S> | null | undefined : InferSchema<S> | null : O["optional"] extends true ? InferSchema<S> | undefined : InferSchema<S>;
+export type RelationHasOneField = readonly ["relation.hasOne", Schema, RelationHasOneOptions];
 export declare const relation: {
     hasMany: <S = any, O extends RelationHasManyOptions = {}>(shape: S, options?: O) => ["relation.hasMany", S, O];
+    hasOne: <S = any, O extends RelationHasOneOptions = {}>(shape: S, options?: O) => ["relation.hasOne", S, O];
 };

package/dist/fields/relation.js

@@ -1,4 +1,7 @@
 const hasMany = (shape, options = {}) => {
     return ["relation.hasMany", shape, options];
 };
-export const relation = { hasMany };
+const hasOne = (shape, options = {}) => {
+    return ["relation.hasOne", shape, options];
+};
+export const relation = { hasMany, hasOne };

package/dist/fields/richText.d.ts

@@ -18,8 +18,23 @@ export declare const paragraphChild: z.ZodType<ParagraphChild>;
 export declare const zodRichTextBlocksSchema: z.ZodArray<z.ZodUnion<readonly [z.ZodObject<{
     type: z.ZodLiteral<"paragraph">;
     children: z.ZodArray<z.ZodType<ParagraphChild, unknown, z.core.$ZodTypeInternals<ParagraphChild, unknown>>>;
+}, z.core.$strip>, z.ZodObject<{
+    type: z.ZodLiteral<"heading">;
+    level: z.ZodNumber;
+    children: z.ZodArray<z.ZodType<ParagraphChild, unknown, z.core.$ZodTypeInternals<ParagraphChild, unknown>>>;
+}, z.core.$strip>, z.ZodObject<{
+    type: z.ZodLiteral<"list">;
+    format: z.ZodEnum<{
+        ordered: "ordered";
+        unordered: "unordered";
+    }>;
+    children: z.ZodArray<z.ZodObject<{
+        type: z.ZodLiteral<"list-item">;
+        children: z.ZodArray<z.ZodType<ParagraphChild, unknown, z.core.$ZodTypeInternals<ParagraphChild, unknown>>>;
+    }, z.core.$strip>>;
 }, z.core.$strip>]>>;
 type ZodRichTextBlocksType = z.output<typeof zodRichTextBlocksSchema>;
+export type RichTextBlocks = ZodRichTextBlocksType;
 export type RichTextBlocksOptions = {
     required?: boolean;
 };

package/dist/fields/richText.js

@@ -19,7 +19,21 @@ const paragraphBlock = z.object({
     type: z.literal("paragraph"),
     children: z.array(paragraphChild),
 });
-export const zodRichTextBlocksSchema = z.array(z.union([paragraphBlock]));
+const headingBlock = z.object({
+    type: z.literal("heading"),
+    level: z.number(),
+    children: z.array(paragraphChild),
+});
+const listItemBlock = z.object({
+    type: z.literal("list-item"),
+    children: z.array(paragraphChild),
+});
+const listBlock = z.object({
+    type: z.literal("list"),
+    format: z.enum(["ordered", "unordered"]),
+    children: z.array(listItemBlock),
+});
+export const zodRichTextBlocksSchema = z.array(z.union([paragraphBlock, headingBlock, listBlock]));
 const blocks = (options = {}) => {
     return ["richText.blocks", options];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "simple-strapi",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.3",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",