feed-common 1.1.0 → 1.1.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.1.1](https://github.com/advertikon/package-maxify-feed-common/compare/v1.1.0...v1.1.1) (2024-02-12)
+
+
+### Bug Fixes
+
+* fix shopify types ([0482e82](https://github.com/advertikon/package-maxify-feed-common/commit/0482e82a5b02eb7cfa4f7b16abce1fb95e4210c5))
+
 # [1.1.0](https://github.com/advertikon/package-maxify-feed-common/compare/v1.0.3...v1.1.0) (2024-02-11)
 
 

package/dist/types/shopify.types.d.ts

@@ -1,17 +1,17 @@
-import { Product } from '@shopify/shopify-api/rest/admin/2023-07/product';
-import { Variant } from '@shopify/shopify-api/rest/admin/2023-07/variant';
-import { Shop } from '@shopify/shopify-api/rest/admin/2023-07/shop';
-import { Webhook } from '@shopify/shopify-api/rest/admin/2023-07/webhook';
-import { CustomCollection } from '@shopify/shopify-api/rest/admin/2023-07/custom_collection';
-import { SmartCollection } from '@shopify/shopify-api/rest/admin/2023-07/smart_collection';
-import { RecurringApplicationCharge } from '@shopify/shopify-api/rest/admin/2023-07/recurring_application_charge';
-type ShopifyCollection = CustomCollection | SmartCollection;
-type ShopifyProductVariant = Variant & {
+import { RestResources } from '@shopify/shopify-api/rest/admin/2023-07';
+type GetInstanceType<T extends keyof RestResources> = InstanceType<RestResources[T]>;
+type ShopifyRecurringCharge = GetInstanceType<'RecurringApplicationCharge'>;
+type ShopifyShop = GetInstanceType<'Shop'>;
+type ShopifyWebhook = GetInstanceType<'Webhook'>;
+type ShopifyCustomCollection = GetInstanceType<'CustomCollection'>;
+type ShopifySmartCollection = GetInstanceType<'SmartCollection'>;
+type ShopifyCollection = ShopifyCustomCollection | ShopifySmartCollection;
+type ShopifyProductVariant = GetInstanceType<'Variant'> & {
     images: {
         variant_ids?: number[];
     }[];
 };
-type ShopifyProduct = Product & {
+type ShopifyProduct = GetInstanceType<'Product'> & {
     variants: ShopifyProductVariant[];
 };
 export type WebhookHeader = {
@@ -32,5 +32,5 @@ export type WebhookHeader = {
     'x-shopify-triggered-at': string;
     'x-shopify-webhook-id': string;
 };
-export { Shop as ShopifyShop, ShopifyProduct, Webhook as ShopifyWebhook, CustomCollection as ShopifyCustomCollection, SmartCollection as ShopifySmartCollection, ShopifyCollection, RecurringApplicationCharge as ShopifyRecurringCharge, };
+export { ShopifyShop, ShopifyProduct, ShopifyWebhook, ShopifyCustomCollection, ShopifySmartCollection, ShopifyCollection, ShopifyRecurringCharge, };
 //# sourceMappingURL=shopify.types.d.ts.map

package/dist/types/shopify.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shopify.types.d.ts","sourceRoot":"","sources":["../../src/types/shopify.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,iDAAiD,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,iDAAiD,CAAC;AAC1E,OAAO,EAAE,IAAI,EAAE,MAAM,8CAA8C,CAAC;AACpE,OAAO,EAAE,OAAO,EAAE,MAAM,iDAAiD,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAC7F,OAAO,EAAE,eAAe,EAAE,MAAM,0DAA0D,CAAC;AAC3F,OAAO,EAAE,0BAA0B,EAAE,MAAM,sEAAsE,CAAC;AAElH,KAAK,iBAAiB,GAAG,gBAAgB,GAAG,eAAe,CAAC;AAC5D,KAAK,qBAAqB,GAAG,OAAO,GAAG;IAAE,MAAM,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,CAAA;CAAE,CAAC;AAChF,KAAK,cAAc,GAAG,OAAO,GAAG;IAAE,QAAQ,EAAE,qBAAqB,EAAE,CAAA;CAAE,CAAC;AAEtE,MAAM,MAAM,aAAa,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,EAAE,MAAM,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,uBAAuB,EAAE,MAAM,CAAC;IAChC,uBAAuB,EAAE,MAAM,CAAC;IAChC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,uBAAuB,EAAE,MAAM,CAAC;IAChC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,wBAAwB,EAAE,MAAM,CAAC;IACjC,sBAAsB,EAAE,MAAM,CAAC;CAClC,CAAC;AAEF,OAAO,EACH,IAAI,IAAI,WAAW,EACnB,cAAc,EACd,OAAO,IAAI,cAAc,EACzB,gBAAgB,IAAI,uBAAuB,EAC3C,eAAe,IAAI,sBAAsB,EACzC,iBAAiB,EACjB,0BAA0B,IAAI,sBAAsB,GACvD,CAAC"}
+{"version":3,"file":"shopify.types.d.ts","sourceRoot":"","sources":["../../src/types/shopify.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAExE,KAAK,eAAe,CAAC,CAAC,SAAS,MAAM,aAAa,IAAI,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;AAErF,KAAK,sBAAsB,GAAG,eAAe,CAAC,4BAA4B,CAAC,CAAC;AAC5E,KAAK,WAAW,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;AAC3C,KAAK,cAAc,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;AACjD,KAAK,uBAAuB,GAAG,eAAe,CAAC,kBAAkB,CAAC,CAAC;AACnE,KAAK,sBAAsB,GAAG,eAAe,CAAC,iBAAiB,CAAC,CAAC;AACjE,KAAK,iBAAiB,GAAG,uBAAuB,GAAG,sBAAsB,CAAC;AAC1E,KAAK,qBAAqB,GAAG,eAAe,CAAC,SAAS,CAAC,GAAG;IACxD,MAAM,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,CAAC;CACtC,CAAC;AACF,KAAK,cAAc,GAAG,eAAe,CAAC,SAAS,CAAC,GAAG;IACjD,QAAQ,EAAE,qBAAqB,EAAE,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,EAAE,MAAM,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,uBAAuB,EAAE,MAAM,CAAC;IAChC,uBAAuB,EAAE,MAAM,CAAC;IAChC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,uBAAuB,EAAE,MAAM,CAAC;IAChC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,wBAAwB,EAAE,MAAM,CAAC;IACjC,sBAAsB,EAAE,MAAM,CAAC;CAChC,CAAC;AAEF,OAAO,EACL,WAAW,EACX,cAAc,EACd,cAAc,EACd,uBAAuB,EACvB,sBAAsB,EACtB,iBAAiB,EACjB,sBAAsB,GACvB,CAAC"}

package/dist/types/shopify.types.js

@@ -1,7 +1,2 @@
-import { Shop } from '@shopify/shopify-api/rest/admin/2023-07/shop';
-import { Webhook } from '@shopify/shopify-api/rest/admin/2023-07/webhook';
-import { CustomCollection } from '@shopify/shopify-api/rest/admin/2023-07/custom_collection';
-import { SmartCollection } from '@shopify/shopify-api/rest/admin/2023-07/smart_collection';
-import { RecurringApplicationCharge } from '@shopify/shopify-api/rest/admin/2023-07/recurring_application_charge';
-export { Shop as ShopifyShop, Webhook as ShopifyWebhook, CustomCollection as ShopifyCustomCollection, SmartCollection as ShopifySmartCollection, RecurringApplicationCharge as ShopifyRecurringCharge, };
+export {};
 //# sourceMappingURL=shopify.types.js.map

package/dist/types/shopify.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"shopify.types.js","sourceRoot":"","sources":["../../src/types/shopify.types.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,8CAA8C,CAAC;AACpE,OAAO,EAAE,OAAO,EAAE,MAAM,iDAAiD,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAC7F,OAAO,EAAE,eAAe,EAAE,MAAM,0DAA0D,CAAC;AAC3F,OAAO,EAAE,0BAA0B,EAAE,MAAM,sEAAsE,CAAC;AAyBlH,OAAO,EACH,IAAI,IAAI,WAAW,EAEnB,OAAO,IAAI,cAAc,EACzB,gBAAgB,IAAI,uBAAuB,EAC3C,eAAe,IAAI,sBAAsB,EAEzC,0BAA0B,IAAI,sBAAsB,GACvD,CAAC"}
+{"version":3,"file":"shopify.types.js","sourceRoot":"","sources":["../../src/types/shopify.types.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "feed-common",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Maxify feed common library",
   "main": "dist/index.js",
   "type": "module",

package/src/types/shopify.types.ts

@@ -1,40 +1,45 @@
-import { Product } from '@shopify/shopify-api/rest/admin/2023-07/product';
-import { Variant } from '@shopify/shopify-api/rest/admin/2023-07/variant';
-import { Shop } from '@shopify/shopify-api/rest/admin/2023-07/shop';
-import { Webhook } from '@shopify/shopify-api/rest/admin/2023-07/webhook';
-import { CustomCollection } from '@shopify/shopify-api/rest/admin/2023-07/custom_collection';
-import { SmartCollection } from '@shopify/shopify-api/rest/admin/2023-07/smart_collection';
-import { RecurringApplicationCharge } from '@shopify/shopify-api/rest/admin/2023-07/recurring_application_charge';
+import { RestResources } from '@shopify/shopify-api/rest/admin/2023-07';
 
-type ShopifyCollection = CustomCollection | SmartCollection;
-type ShopifyProductVariant = Variant & { images: { variant_ids?: number[] }[] };
-type ShopifyProduct = Product & { variants: ShopifyProductVariant[] };
+type GetInstanceType<T extends keyof RestResources> = InstanceType<RestResources[T]>;
+
+type ShopifyRecurringCharge = GetInstanceType<'RecurringApplicationCharge'>;
+type ShopifyShop = GetInstanceType<'Shop'>;
+type ShopifyWebhook = GetInstanceType<'Webhook'>;
+type ShopifyCustomCollection = GetInstanceType<'CustomCollection'>;
+type ShopifySmartCollection = GetInstanceType<'SmartCollection'>;
+type ShopifyCollection = ShopifyCustomCollection | ShopifySmartCollection;
+type ShopifyProductVariant = GetInstanceType<'Variant'> & {
+  images: { variant_ids?: number[] }[];
+};
+type ShopifyProduct = GetInstanceType<'Product'> & {
+  variants: ShopifyProductVariant[];
+};
 
 export type WebhookHeader = {
-    host: string;
-    'user-agent': string;
-    'content-length': string;
-    accept: string;
-    'accept-encoding': string;
-    'content-type': string;
-    'x-forwarded-for': string;
-    'x-forwarded-host': string;
-    'x-forwarded-proto': string;
-    'x-shopify-api-version': string;
-    'x-shopify-hmac-sha256': string;
-    'x-shopify-product-id': string;
-    'x-shopify-shop-domain': string;
-    'x-shopify-topic': string;
-    'x-shopify-triggered-at': string;
-    'x-shopify-webhook-id': string;
+  host: string;
+  'user-agent': string;
+  'content-length': string;
+  accept: string;
+  'accept-encoding': string;
+  'content-type': string;
+  'x-forwarded-for': string;
+  'x-forwarded-host': string;
+  'x-forwarded-proto': string;
+  'x-shopify-api-version': string;
+  'x-shopify-hmac-sha256': string;
+  'x-shopify-product-id': string;
+  'x-shopify-shop-domain': string;
+  'x-shopify-topic': string;
+  'x-shopify-triggered-at': string;
+  'x-shopify-webhook-id': string;
 };
 
 export {
-    Shop as ShopifyShop,
-    ShopifyProduct,
-    Webhook as ShopifyWebhook,
-    CustomCollection as ShopifyCustomCollection,
-    SmartCollection as ShopifySmartCollection,
-    ShopifyCollection,
-    RecurringApplicationCharge as ShopifyRecurringCharge,
+  ShopifyShop,
+  ShopifyProduct,
+  ShopifyWebhook,
+  ShopifyCustomCollection,
+  ShopifySmartCollection,
+  ShopifyCollection,
+  ShopifyRecurringCharge,
 };