@deallony/shared 1.1.97 → 1.1.98

package/dist/cjs/schema/ad/save-ad.schema.d.ts

@@ -1,4 +1,10 @@
 import { z } from 'zod';
+export declare const subjectTypeSchema: z.ZodEnum<{
+    properties: "properties";
+    services: "services";
+    motors: "motors";
+    used_products: "used_products";
+}>;
 export declare const createAdSchema: z.ZodObject<{
     motor: z.ZodNullable<z.ZodOptional<z.ZodObject<{
         ad_id: z.ZodOptional<z.ZodCoercedNumber<unknown>>;
@@ -42,10 +48,6 @@ export declare const createAdSchema: z.ZodObject<{
             facility_id: z.ZodCoercedNumber<unknown>;
             distance_in_meters: z.ZodOptional<z.ZodCoercedNumber<unknown>>;
         }, z.core.$strip>>>;
-        condition_id: z.ZodPipe<z.ZodOptional<z.ZodCoercedNumber<unknown>>, z.ZodTransform<number | null | undefined, number | undefined>>;
-        age_id: z.ZodPipe<z.ZodOptional<z.ZodCoercedNumber<unknown>>, z.ZodTransform<number | null | undefined, number | undefined>>;
-        property_status_id: z.ZodPipe<z.ZodOptional<z.ZodCoercedNumber<unknown>>, z.ZodTransform<number | null | undefined, number | undefined>>;
-        license_type_id: z.ZodPipe<z.ZodOptional<z.ZodCoercedNumber<unknown>>, z.ZodTransform<number | null | undefined, number | undefined>>;
     }, z.core.$strip>>>;
     product: z.ZodNullable<z.ZodOptional<z.ZodObject<{
         ad_id: z.ZodOptional<z.ZodCoercedNumber<unknown>>;
@@ -77,7 +79,6 @@ export declare const createAdSchema: z.ZodObject<{
     city_id: z.ZodNullable<z.ZodOptional<z.ZodCoercedNumber<unknown>>>;
     latitude: z.ZodNullable<z.ZodOptional<z.ZodCoercedNumber<unknown>>>;
     longitude: z.ZodNullable<z.ZodOptional<z.ZodCoercedNumber<unknown>>>;
-    baseAdminBoundaryId: z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodNullable<z.ZodOptional<z.ZodCoercedNumber<unknown>>>>;
     media: z.ZodNullable<z.ZodOptional<z.ZodArray<z.ZodAny>>>;
     subject_type: z.ZodOptional<z.ZodEnum<{
         properties: "properties";
@@ -144,10 +145,6 @@ export declare const updateAdSchema: z.ZodObject<{
             facility_id: z.ZodCoercedNumber<unknown>;
             distance_in_meters: z.ZodOptional<z.ZodCoercedNumber<unknown>>;
         }, z.core.$strip>>>;
-        condition_id: z.ZodPipe<z.ZodOptional<z.ZodCoercedNumber<unknown>>, z.ZodTransform<number | null | undefined, number | undefined>>;
-        age_id: z.ZodPipe<z.ZodOptional<z.ZodCoercedNumber<unknown>>, z.ZodTransform<number | null | undefined, number | undefined>>;
-        property_status_id: z.ZodPipe<z.ZodOptional<z.ZodCoercedNumber<unknown>>, z.ZodTransform<number | null | undefined, number | undefined>>;
-        license_type_id: z.ZodPipe<z.ZodOptional<z.ZodCoercedNumber<unknown>>, z.ZodTransform<number | null | undefined, number | undefined>>;
         id: z.ZodCoercedNumber<unknown>;
     }, z.core.$strip>>>;
     product: z.ZodNullable<z.ZodOptional<z.ZodObject<{
@@ -166,7 +163,6 @@ export declare const updateAdSchema: z.ZodObject<{
         unit_id: z.ZodNullable<z.ZodOptional<z.ZodCoercedNumber<unknown>>>;
         locations: z.ZodArray<z.ZodObject<{
             city_id: z.ZodNumber;
-            district_id: z.ZodPipe<z.ZodTransform<{} | undefined, unknown>, z.ZodOptional<z.ZodCoercedNumber<unknown>>>;
         }, z.core.$strip>>;
     }, z.core.$strip>>>;
     title: z.ZodOptional<z.ZodString>;
@@ -179,7 +175,6 @@ export declare const updateAdSchema: z.ZodObject<{
     city_id: z.ZodNullable<z.ZodOptional<z.ZodCoercedNumber<unknown>>>;
     latitude: z.ZodNullable<z.ZodOptional<z.ZodCoercedNumber<unknown>>>;
     longitude: z.ZodNullable<z.ZodOptional<z.ZodCoercedNumber<unknown>>>;
-    baseAdminBoundaryId: z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodNullable<z.ZodOptional<z.ZodCoercedNumber<unknown>>>>;
     media: z.ZodNullable<z.ZodOptional<z.ZodArray<z.ZodAny>>>;
     subject_type: z.ZodOptional<z.ZodEnum<{
         properties: "properties";
@@ -243,10 +238,6 @@ export declare const saveAdSchema: z.ZodUnion<readonly [z.ZodObject<{
             facility_id: z.ZodCoercedNumber<unknown>;
             distance_in_meters: z.ZodOptional<z.ZodCoercedNumber<unknown>>;
         }, z.core.$strip>>>;
-        condition_id: z.ZodPipe<z.ZodOptional<z.ZodCoercedNumber<unknown>>, z.ZodTransform<number | null | undefined, number | undefined>>;
-        age_id: z.ZodPipe<z.ZodOptional<z.ZodCoercedNumber<unknown>>, z.ZodTransform<number | null | undefined, number | undefined>>;
-        property_status_id: z.ZodPipe<z.ZodOptional<z.ZodCoercedNumber<unknown>>, z.ZodTransform<number | null | undefined, number | undefined>>;
-        license_type_id: z.ZodPipe<z.ZodOptional<z.ZodCoercedNumber<unknown>>, z.ZodTransform<number | null | undefined, number | undefined>>;
     }, z.core.$strip>>>;
     product: z.ZodNullable<z.ZodOptional<z.ZodObject<{
         ad_id: z.ZodOptional<z.ZodCoercedNumber<unknown>>;
@@ -278,7 +269,6 @@ export declare const saveAdSchema: z.ZodUnion<readonly [z.ZodObject<{
     city_id: z.ZodNullable<z.ZodOptional<z.ZodCoercedNumber<unknown>>>;
     latitude: z.ZodNullable<z.ZodOptional<z.ZodCoercedNumber<unknown>>>;
     longitude: z.ZodNullable<z.ZodOptional<z.ZodCoercedNumber<unknown>>>;
-    baseAdminBoundaryId: z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodNullable<z.ZodOptional<z.ZodCoercedNumber<unknown>>>>;
     media: z.ZodNullable<z.ZodOptional<z.ZodArray<z.ZodAny>>>;
     subject_type: z.ZodOptional<z.ZodEnum<{
         properties: "properties";
@@ -344,10 +334,6 @@ export declare const saveAdSchema: z.ZodUnion<readonly [z.ZodObject<{
             facility_id: z.ZodCoercedNumber<unknown>;
             distance_in_meters: z.ZodOptional<z.ZodCoercedNumber<unknown>>;
         }, z.core.$strip>>>;
-        condition_id: z.ZodPipe<z.ZodOptional<z.ZodCoercedNumber<unknown>>, z.ZodTransform<number | null | undefined, number | undefined>>;
-        age_id: z.ZodPipe<z.ZodOptional<z.ZodCoercedNumber<unknown>>, z.ZodTransform<number | null | undefined, number | undefined>>;
-        property_status_id: z.ZodPipe<z.ZodOptional<z.ZodCoercedNumber<unknown>>, z.ZodTransform<number | null | undefined, number | undefined>>;
-        license_type_id: z.ZodPipe<z.ZodOptional<z.ZodCoercedNumber<unknown>>, z.ZodTransform<number | null | undefined, number | undefined>>;
         id: z.ZodCoercedNumber<unknown>;
     }, z.core.$strip>>>;
     product: z.ZodNullable<z.ZodOptional<z.ZodObject<{
@@ -366,7 +352,6 @@ export declare const saveAdSchema: z.ZodUnion<readonly [z.ZodObject<{
         unit_id: z.ZodNullable<z.ZodOptional<z.ZodCoercedNumber<unknown>>>;
         locations: z.ZodArray<z.ZodObject<{
             city_id: z.ZodNumber;
-            district_id: z.ZodPipe<z.ZodTransform<{} | undefined, unknown>, z.ZodOptional<z.ZodCoercedNumber<unknown>>>;
         }, z.core.$strip>>;
     }, z.core.$strip>>>;
     title: z.ZodOptional<z.ZodString>;
@@ -379,7 +364,6 @@ export declare const saveAdSchema: z.ZodUnion<readonly [z.ZodObject<{
     city_id: z.ZodNullable<z.ZodOptional<z.ZodCoercedNumber<unknown>>>;
     latitude: z.ZodNullable<z.ZodOptional<z.ZodCoercedNumber<unknown>>>;
     longitude: z.ZodNullable<z.ZodOptional<z.ZodCoercedNumber<unknown>>>;
-    baseAdminBoundaryId: z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodNullable<z.ZodOptional<z.ZodCoercedNumber<unknown>>>>;
     media: z.ZodNullable<z.ZodOptional<z.ZodArray<z.ZodAny>>>;
     subject_type: z.ZodOptional<z.ZodEnum<{
         properties: "properties";

package/dist/cjs/schema/ad/save-ad.schema.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.saveAdSchema = exports.updateAdSchema = exports.createAdSchema = void 0;
+exports.saveAdSchema = exports.updateAdSchema = exports.createAdSchema = exports.subjectTypeSchema = void 0;
 const zod_1 = require("zod");
-const subjectTypeSchema = zod_1.z.enum(['properties', 'services', 'motors', 'used_products']);
+exports.subjectTypeSchema = zod_1.z.enum(['properties', 'services', 'motors', 'used_products']);
 const adLocationSchema = zod_1.z.object({
     ad_id: zod_1.z.coerce.number().int().positive().optional(),
     admin_boundary_id: zod_1.z.coerce.number().int().positive(),
@@ -53,10 +53,10 @@ const createPropertySchema = zod_1.z.object({
     feature_ids: zod_1.z.array(zod_1.z.coerce.number().int().positive()).optional(),
     facility_ids: zod_1.z.array(zod_1.z.coerce.number().int().positive()).optional(),
     property_facilities: zod_1.z.array(propertyFacilityRelationSchema).optional(),
-    condition_id: zod_1.z.coerce.number().int().min(0).optional().transform((val) => (val === 0 ? null : val)),
-    age_id: zod_1.z.coerce.number().int().min(0).optional().transform((val) => (val === 0 ? null : val)),
-    property_status_id: zod_1.z.coerce.number().int().min(0).optional().transform((val) => (val === 0 ? null : val)),
-    license_type_id: zod_1.z.coerce.number().int().min(0).optional().transform((val) => (val === 0 ? null : val)),
+    // condition_id: z.coerce.number().int().min(0).optional().transform((val) => (val === 0 ? null : val)),
+    // age_id: z.coerce.number().int().min(0).optional().transform((val) => (val === 0 ? null : val)),
+    // property_status_id: z.coerce.number().int().min(0).optional().transform((val) => (val === 0 ? null : val)),
+    // license_type_id: z.coerce.number().int().min(0).optional().transform((val) => (val === 0 ? null : val)),
 });
 const updatePropertySchema = createPropertySchema.extend({
     id: zod_1.z.coerce.number().int().positive(),
@@ -85,7 +85,10 @@ const createServiceLocationSchema = zod_1.z.object({
 });
 const updateServiceLocationSchema = zod_1.z.object({
     city_id: zod_1.z.number(),
-    district_id: zod_1.z.preprocess((v) => (v === null || v === '' ? undefined : v), zod_1.z.coerce.number().int().optional()),
+    // district_id: z.preprocess(
+    //   (v) => (v === null || v === '' ? undefined : v),
+    //   z.coerce.number().int().optional(),
+    // ),
 });
 const createServiceSchema = zod_1.z.object({
     ad_id: zod_1.z.coerce.number().int().positive().optional(),
@@ -113,13 +116,15 @@ const baseAdCommon = zod_1.z.object({
     city_id: zod_1.z.coerce.number().int().positive().optional().nullable(),
     latitude: zod_1.z.coerce.number().optional().nullable(),
     longitude: zod_1.z.coerce.number().optional().nullable(),
-    baseAdminBoundaryId: zod_1.z.preprocess((value) => {
-        if (value === 0 || value === '0')
-            return undefined;
-        return value;
-    }, zod_1.z.coerce.number().optional().nullable()),
+    // baseAdminBoundaryId: z.preprocess(
+    //   (value) => {
+    //     if (value === 0 || value === '0') return undefined;
+    //     return value;
+    //   },
+    //   z.coerce.number().optional().nullable(),
+    // ),
     media: zod_1.z.array(zod_1.z.any()).optional().nullable(),
-    subject_type: subjectTypeSchema.optional(),
+    subject_type: exports.subjectTypeSchema.optional(),
     base_price: zod_1.z.coerce.number().optional().nullable(),
     contact_methods: zod_1.z
         .object({

package/dist/cjs/schema/ai/ai-fill-ad-form.schema.d.ts

@@ -11,4 +11,10 @@ export declare const aiFillAdFormSchema: z.ZodObject<{
         mimeType: z.ZodString;
         name: z.ZodString;
     }, z.core.$strip>>>;
+    subject_type: z.ZodEnum<{
+        properties: "properties";
+        services: "services";
+        motors: "motors";
+        used_products: "used_products";
+    }>;
 }, z.core.$strip>;

package/dist/cjs/schema/ai/ai-fill-ad-form.schema.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.aiFillAdFormSchema = exports.aiAdFillFormFileSchema = void 0;
 const zod_1 = require("zod");
+const ad_1 = require("../ad");
 exports.aiAdFillFormFileSchema = zod_1.z.object({
     URL: zod_1.z.string().trim().min(1),
     mimeType: zod_1.z.string().trim().min(1),
@@ -10,4 +11,5 @@ exports.aiAdFillFormFileSchema = zod_1.z.object({
 exports.aiFillAdFormSchema = zod_1.z.object({
     text: zod_1.z.string().trim(),
     files: zod_1.z.array(exports.aiAdFillFormFileSchema).optional(),
+    subject_type: ad_1.subjectTypeSchema
 });

package/dist/esm/schema/ad/save-ad.schema.js

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-const subjectTypeSchema = z.enum(['properties', 'services', 'motors', 'used_products']);
+export const subjectTypeSchema = z.enum(['properties', 'services', 'motors', 'used_products']);
 const adLocationSchema = z.object({
     ad_id: z.coerce.number().int().positive().optional(),
     admin_boundary_id: z.coerce.number().int().positive(),
@@ -50,10 +50,10 @@ const createPropertySchema = z.object({
     feature_ids: z.array(z.coerce.number().int().positive()).optional(),
     facility_ids: z.array(z.coerce.number().int().positive()).optional(),
     property_facilities: z.array(propertyFacilityRelationSchema).optional(),
-    condition_id: z.coerce.number().int().min(0).optional().transform((val) => (val === 0 ? null : val)),
-    age_id: z.coerce.number().int().min(0).optional().transform((val) => (val === 0 ? null : val)),
-    property_status_id: z.coerce.number().int().min(0).optional().transform((val) => (val === 0 ? null : val)),
-    license_type_id: z.coerce.number().int().min(0).optional().transform((val) => (val === 0 ? null : val)),
+    // condition_id: z.coerce.number().int().min(0).optional().transform((val) => (val === 0 ? null : val)),
+    // age_id: z.coerce.number().int().min(0).optional().transform((val) => (val === 0 ? null : val)),
+    // property_status_id: z.coerce.number().int().min(0).optional().transform((val) => (val === 0 ? null : val)),
+    // license_type_id: z.coerce.number().int().min(0).optional().transform((val) => (val === 0 ? null : val)),
 });
 const updatePropertySchema = createPropertySchema.extend({
     id: z.coerce.number().int().positive(),
@@ -82,7 +82,10 @@ const createServiceLocationSchema = z.object({
 });
 const updateServiceLocationSchema = z.object({
     city_id: z.number(),
-    district_id: z.preprocess((v) => (v === null || v === '' ? undefined : v), z.coerce.number().int().optional()),
+    // district_id: z.preprocess(
+    //   (v) => (v === null || v === '' ? undefined : v),
+    //   z.coerce.number().int().optional(),
+    // ),
 });
 const createServiceSchema = z.object({
     ad_id: z.coerce.number().int().positive().optional(),
@@ -110,11 +113,13 @@ const baseAdCommon = z.object({
     city_id: z.coerce.number().int().positive().optional().nullable(),
     latitude: z.coerce.number().optional().nullable(),
     longitude: z.coerce.number().optional().nullable(),
-    baseAdminBoundaryId: z.preprocess((value) => {
-        if (value === 0 || value === '0')
-            return undefined;
-        return value;
-    }, z.coerce.number().optional().nullable()),
+    // baseAdminBoundaryId: z.preprocess(
+    //   (value) => {
+    //     if (value === 0 || value === '0') return undefined;
+    //     return value;
+    //   },
+    //   z.coerce.number().optional().nullable(),
+    // ),
     media: z.array(z.any()).optional().nullable(),
     subject_type: subjectTypeSchema.optional(),
     base_price: z.coerce.number().optional().nullable(),

package/dist/esm/schema/ai/ai-fill-ad-form.schema.js

@@ -1,4 +1,5 @@
 import { z } from 'zod';
+import { subjectTypeSchema } from '../ad/index.js';
 export const aiAdFillFormFileSchema = z.object({
     URL: z.string().trim().min(1),
     mimeType: z.string().trim().min(1),
@@ -7,4 +8,5 @@ export const aiAdFillFormFileSchema = z.object({
 export const aiFillAdFormSchema = z.object({
     text: z.string().trim(),
     files: z.array(aiAdFillFormFileSchema).optional(),
+    subject_type: subjectTypeSchema
 });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@deallony/shared",
-    "version": "1.1.97",
+    "version": "1.1.98",
     "private": false,
     "main": "dist/cjs/index.js",
     "module": "dist/esm/index.js",
@@ -27,7 +27,7 @@
         "dashboard:update": "cd ../frontend-react-aloo &&  node ./scripts/upgrade-dellony.js",
         "current": "npm view @deallony/shared version",
         "============================= Links with project =============================": "",
-        "link:backend": "cd ../backend-service-marketplace && pnpm add @deallony/shared@file:../shared-deallony",
+        "link:backend": "cd ../backend-service-marketplace && pnpm uninstall @deallony/shared && pnpm add @deallony/shared@file:../shared-deallony",
         "========": "============ DEFAULT ============",
         "build": "tsc -p tsconfig.cjs.json && tsc -p tsconfig.esm.json && node ./scripts/fix-esm-imports.mjs",
         "watch": "tsc -p tsconfig.cjs.json --watch",