@teambit/code.ui.queries.get-file-content 0.0.504 → 0.0.506

package/dist/get-file-content.d.ts

@@ -1,38 +1,5 @@
-import { ComponentID } from '@teambit/component';
-declare type FileResult = {
-    getHost: {
-        id: string;
-        get: {
-            id: {
-                name: string;
-                version: string;
-                scope: string;
-            };
-            getFile?: string;
-        };
-    };
-};
-export declare function useFileContent(componentId?: ComponentID, filePath?: string, skip?: boolean): {
-    client: import("@apollo/client").ApolloClient<any>;
-    observable: import("@apollo/client").ObservableQuery<FileResult, import("@apollo/client").OperationVariables>;
-    previousData?: FileResult;
-    error?: import("@apollo/client").ApolloError;
+import type { ComponentID } from '@teambit/component-id';
+export declare function useFileContent(componentId?: ComponentID, filePath?: string, skip?: boolean, host?: string): {
+    fileContent: any;
     loading: boolean;
-    networkStatus: import("@apollo/client").NetworkStatus;
-    called: boolean;
-    variables: import("@apollo/client").OperationVariables;
-    startPolling: (pollInterval: number) => void;
-    stopPolling: () => void;
-    subscribeToMore: <TSubscriptionData = FileResult, TSubscriptionVariables = import("@apollo/client").OperationVariables>(options: import("@apollo/client").SubscribeToMoreOptions<FileResult, TSubscriptionVariables, TSubscriptionData>) => () => void;
-    updateQuery: <TVars = import("@apollo/client").OperationVariables>(mapFn: (previousQueryResult: FileResult, options: Pick<import("@apollo/client").WatchQueryOptions<TVars, FileResult>, "variables">) => FileResult) => void;
-    refetch: (variables?: Partial<import("@apollo/client").OperationVariables>) => Promise<import("@apollo/client").ApolloQueryResult<FileResult>>;
-    reobserve: (newOptions?: Partial<import("@apollo/client").WatchQueryOptions<import("@apollo/client").OperationVariables, FileResult>>, newNetworkStatus?: import("@apollo/client").NetworkStatus) => Promise<import("@apollo/client").ApolloQueryResult<FileResult>>;
-    fetchMore: <TFetchData = FileResult, TFetchVars = import("@apollo/client").OperationVariables>(fetchMoreOptions: import("@apollo/client").FetchMoreQueryOptions<TFetchVars, TFetchData> & {
-        updateQuery?: (previousQueryResult: FileResult, options: {
-            fetchMoreResult: TFetchData;
-            variables: TFetchVars;
-        }) => FileResult;
-    }) => Promise<import("@apollo/client").ApolloQueryResult<TFetchData>>;
-    fileContent: string;
 };
-export {};

package/dist/get-file-content.js

@@ -1,22 +1,11 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useFileContent = void 0;
+exports.useFileContent = useFileContent;
 const client_1 = require("@apollo/client");
 const ui_foundation_ui_hooks_use_data_query_1 = require("@teambit/ui-foundation.ui.hooks.use-data-query");
 const getFile = (0, client_1.gql) `
-  query getFile($id: String!, $path: String) {
-    getHost {
+  query getFile($id: String!, $extensionId: String, $path: String) {
+    getHost(id: $extensionId) {
       id # used for GQL caching
       get(id: $id) {
         id {
@@ -30,15 +19,41 @@ const getFile = (0, client_1.gql) `
     }
   }
 `;
-function useFileContent(componentId, filePath, skip) {
+const COMPONENT_CHANGED_SUBSCRIPTION = (0, client_1.gql) `
+  subscription OnComponentChangedForFile {
+    componentChanged {
+      component {
+        id {
+          name
+          scope
+        }
+      }
+    }
+  }
+`;
+function useFileContent(componentId, filePath, skip, host) {
     var _a, _b;
     const id = componentId === null || componentId === void 0 ? void 0 : componentId.toString();
-    const _c = (0, ui_foundation_ui_hooks_use_data_query_1.useDataQuery)(getFile, {
-        variables: { id, path: filePath },
-        skip: skip || !componentId || filePath === undefined,
-    }), { data } = _c, rest = __rest(_c, ["data"]);
+    const querySkip = skip || !componentId || filePath === undefined;
+    const { data, loading, refetch } = (0, ui_foundation_ui_hooks_use_data_query_1.useDataQuery)(getFile, {
+        variables: { id, path: filePath, extensionId: host },
+        skip: querySkip,
+    });
+    (0, client_1.useSubscription)(COMPONENT_CHANGED_SUBSCRIPTION, {
+        skip: querySkip,
+        onSubscriptionData: ({ subscriptionData }) => {
+            var _a, _b, _c;
+            const changedId = (_c = (_b = (_a = subscriptionData.data) === null || _a === void 0 ? void 0 : _a.componentChanged) === null || _b === void 0 ? void 0 : _b.component) === null || _c === void 0 ? void 0 : _c.id;
+            if (!changedId || !componentId)
+                return;
+            if (changedId.name !== componentId.fullName)
+                return;
+            if (changedId.scope && componentId.scope && changedId.scope !== componentId.scope)
+                return;
+            refetch();
+        },
+    });
     const fileContent = (_b = (_a = data === null || data === void 0 ? void 0 : data.getHost) === null || _a === void 0 ? void 0 : _a.get) === null || _b === void 0 ? void 0 : _b.getFile;
-    return Object.assign({ fileContent }, rest);
+    return { fileContent, loading };
 }
-exports.useFileContent = useFileContent;
 //# sourceMappingURL=get-file-content.js.map

package/dist/get-file-content.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-file-content.js","sourceRoot":"","sources":["../get-file-content.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2CAAqC;AACrC,0GAA8E;AAG9E,MAAM,OAAO,GAAG,IAAA,YAAG,EAAA;;;;;;;;;;;;;;;CAelB,CAAC;AAgBF,SAAgB,cAAc,CAAC,WAAyB,EAAE,QAAiB,EAAE,IAAc;;IACzF,MAAM,EAAE,GAAG,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,QAAQ,EAAE,CAAC;IACnC,MAAM,KAAoB,IAAA,oDAAY,EAAa,OAAO,EAAE;QAC1D,SAAS,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACjC,IAAI,EAAE,IAAI,IAAI,CAAC,WAAW,IAAI,QAAQ,KAAK,SAAS;KACrD,CAAC,EAHI,EAAE,IAAI,OAGV,EAHe,IAAI,cAAf,QAAiB,CAGrB,CAAC;IAEH,MAAM,WAAW,GAAG,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,GAAG,0CAAE,OAAO,CAAC;IAEhD,uBAAS,WAAW,IAAK,IAAI,EAAG;AAClC,CAAC;AAVD,wCAUC"}
+{"version":3,"file":"get-file-content.js","sourceRoot":"","sources":["../get-file-content.ts"],"names":[],"mappings":";;AAwDA,wCAuBC;AA/ED,2CAAsD;AACtD,0GAA8E;AAG9E,MAAM,OAAO,GAAG,IAAA,YAAG,EAAA;;;;;;;;;;;;;;;CAelB,CAAC;AAEF,MAAM,8BAA8B,GAAG,IAAA,YAAG,EAAA;;;;;;;;;;;CAWzC,CAAC;AAwBF,SAAgB,cAAc,CAAC,WAAyB,EAAE,QAAiB,EAAE,IAAc,EAAE,IAAa;;IACxG,MAAM,EAAE,GAAG,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,QAAQ,EAAE,CAAC;IACnC,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,WAAW,IAAI,QAAQ,KAAK,SAAS,CAAC;IAEjE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,IAAA,oDAAY,EAAa,OAAO,EAAE;QACnE,SAAS,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE;QACpD,IAAI,EAAE,SAAS;KAChB,CAAC,CAAC;IAEH,IAAA,wBAAe,EAA0B,8BAA8B,EAAE;QACvE,IAAI,EAAE,SAAS;QACf,kBAAkB,EAAE,CAAC,EAAE,gBAAgB,EAAE,EAAE,EAAE;;YAC3C,MAAM,SAAS,GAAG,MAAA,MAAA,MAAA,gBAAgB,CAAC,IAAI,0CAAE,gBAAgB,0CAAE,SAAS,0CAAE,EAAE,CAAC;YACzE,IAAI,CAAC,SAAS,IAAI,CAAC,WAAW;gBAAE,OAAO;YACvC,IAAI,SAAS,CAAC,IAAI,KAAK,WAAW,CAAC,QAAQ;gBAAE,OAAO;YACpD,IAAI,SAAS,CAAC,KAAK,IAAI,WAAW,CAAC,KAAK,IAAI,SAAS,CAAC,KAAK,KAAK,WAAW,CAAC,KAAK;gBAAE,OAAO;YAC1F,OAAO,EAAE,CAAC;QACZ,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,GAAG,0CAAE,OAAO,CAAC;IAEhD,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;AAClC,CAAC"}

package/get-file-content.ts

@@ -1,10 +1,10 @@
-import { gql } from '@apollo/client';
+import { gql, useSubscription } from '@apollo/client';
 import { useDataQuery } from '@teambit/ui-foundation.ui.hooks.use-data-query';
-import { ComponentID } from '@teambit/component';
+import type { ComponentID } from '@teambit/component-id';
 
 const getFile = gql`
-  query getFile($id: String!, $path: String) {
-    getHost {
+  query getFile($id: String!, $extensionId: String, $path: String) {
+    getHost(id: $extensionId) {
       id # used for GQL caching
       get(id: $id) {
         id {
@@ -19,6 +19,19 @@ const getFile = gql`
   }
 `;
 
+const COMPONENT_CHANGED_SUBSCRIPTION = gql`
+  subscription OnComponentChangedForFile {
+    componentChanged {
+      component {
+        id {
+          name
+          scope
+        }
+      }
+    }
+  }
+`;
+
 type FileResult = {
   getHost: {
     id: string;
@@ -33,14 +46,35 @@ type FileResult = {
   };
 };
 
-export function useFileContent(componentId?: ComponentID, filePath?: string, skip?: boolean) {
+type ComponentChangedSubData = {
+  componentChanged?: {
+    component?: {
+      id: { name: string; scope: string };
+    };
+  };
+};
+
+export function useFileContent(componentId?: ComponentID, filePath?: string, skip?: boolean, host?: string) {
   const id = componentId?.toString();
-  const { data, ...rest } = useDataQuery<FileResult>(getFile, {
-    variables: { id, path: filePath },
-    skip: skip || !componentId || filePath === undefined,
+  const querySkip = skip || !componentId || filePath === undefined;
+
+  const { data, loading, refetch } = useDataQuery<FileResult>(getFile, {
+    variables: { id, path: filePath, extensionId: host },
+    skip: querySkip,
+  });
+
+  useSubscription<ComponentChangedSubData>(COMPONENT_CHANGED_SUBSCRIPTION, {
+    skip: querySkip,
+    onSubscriptionData: ({ subscriptionData }) => {
+      const changedId = subscriptionData.data?.componentChanged?.component?.id;
+      if (!changedId || !componentId) return;
+      if (changedId.name !== componentId.fullName) return;
+      if (changedId.scope && componentId.scope && changedId.scope !== componentId.scope) return;
+      refetch();
+    },
   });
 
   const fileContent = data?.getHost?.get?.getFile;
 
-  return { fileContent, ...rest };
+  return { fileContent, loading };
 }

package/package.json

@@ -1,32 +1,35 @@
 {
   "name": "@teambit/code.ui.queries.get-file-content",
-  "version": "0.0.504",
-  "homepage": "https://bit.dev/teambit/code/ui/queries/get-file-content",
+  "version": "0.0.506",
+  "homepage": "https://bit.cloud/teambit/code/ui/queries/get-file-content",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.code",
     "name": "ui/queries/get-file-content",
-    "version": "0.0.504"
+    "version": "0.0.506"
   },
   "dependencies": {
     "core-js": "^3.0.0",
-    "@teambit/ui-foundation.ui.hooks.use-data-query": "0.0.500"
+    "@teambit/component-id": "1.2.4",
+    "@teambit/ui-foundation.ui.hooks.use-data-query": "0.0.506"
   },
   "devDependencies": {
     "@types/mocha": "9.1.0",
-    "@types/testing-library__jest-dom": "5.9.5",
-    "@babel/runtime": "7.20.0",
-    "@types/jest": "^26.0.0",
-    "@types/react-dom": "^17.0.5",
+    "@types/node": "12.20.4",
     "@types/react": "^17.0.8",
-    "@types/node": "12.20.4"
+    "@types/react-dom": "^17.0.5",
+    "@types/jest": "^26.0.0",
+    "@babel/runtime": "7.20.0",
+    "@types/testing-library__jest-dom": "5.9.5"
   },
   "peerDependencies": {
     "@apollo/client": "^3.6.0",
-    "react-dom": "^16.8.0 || ^17.0.0",
-    "react": "^16.8.0 || ^17.0.0"
+    "react": "^16.8.0 || ^17.0.0",
+    "react-dom": "^16.8.0 || ^17.0.0"
   },
   "license": "Apache-2.0",
+  "optionalDependencies": {},
+  "peerDependenciesMeta": {},
   "private": false,
   "engines": {
     "node": ">=12.22.0"
@@ -45,4 +48,4 @@
     "angular",
     "angular-components"
   ]
-}
+}

package/dist/tsconfig.json

@@ -1,32 +0,0 @@
-{
-    "compilerOptions": {
-        "lib": [
-            "es2019",
-            "DOM",
-            "ES6",
-            "DOM.Iterable"
-        ],
-        "target": "es2015",
-        "module": "CommonJS",
-        "jsx": "react",
-        "allowJs": true,
-        "composite": true,
-        "declaration": true,
-        "sourceMap": true,
-        "skipLibCheck": true,
-        "experimentalDecorators": true,
-        "outDir": "dist",
-        "moduleResolution": "node",
-        "esModuleInterop": true,
-        "rootDir": ".",
-        "resolveJsonModule": true
-    },
-    "exclude": [
-        "dist",
-        "package.json"
-    ],
-    "include": [
-        "**/*",
-        "**/*.json"
-    ]
-}

package/tsconfig.json

@@ -1,32 +0,0 @@
-{
-  "compilerOptions": {
-    "lib": [
-      "es2019",
-      "DOM",
-      "ES6",
-      "DOM.Iterable"
-    ],
-    "target": "es2015",
-    "module": "CommonJS",
-    "jsx": "react",
-    "allowJs": true,
-    "composite": true,
-    "declaration": true,
-    "sourceMap": true,
-    "skipLibCheck": true,
-    "experimentalDecorators": true,
-    "outDir": "dist",
-    "moduleResolution": "node",
-    "esModuleInterop": true,
-    "rootDir": ".",
-    "resolveJsonModule": true
-  },
-  "exclude": [
-    "dist",
-    "package.json"
-  ],
-  "include": [
-    "**/*",
-    "**/*.json"
-  ]
-}