perf: improve editor performance

Author: JesusTheHun

packages/cbjs/src/clusterTypes/clusterTypes.ts

@@ -29,11 +29,11 @@ import {
   FriendlyPathToArrayIndex,
   GetKeyspaceOptions,
   IsNever,
+  JsonDocumentDef,
   Keyspace,
   KeyspaceDocDef,
   MissingDefaultCollection,
   MissingDefaultScope,
-  ObjectDocumentDef,
   ScopeName,
   WildcardFallback,
 } from '@cbjsdev/shared';
@@ -46,6 +46,7 @@ export type { DocDef };
 
 /**
  * Add friendly paths that are autocomplete friendly, is configured that way.
+ * TODO incorporate this into the DocumentCodeCompletion
  */
 // prettier-ignore
 export type PathAutocomplete<Instance, Path> =
@@ -103,26 +104,26 @@ export type CollectionKeyspace<Instance> =
 ;
 
 // prettier-ignore
-export type CollectionJsonDocDef<Instance> = ObjectDocumentDef<CollectionDocDef<Instance>>;
+export type CollectionJsonDocDef<Instance> = JsonDocumentDef<CollectionDocDef<Instance>>;
 
 /**
  * Extract the DocDef in a given collection that match the given key.
  */
 // prettier-ignore
 export type ExtractCollectionJsonDocDef<Instance, Key extends string> =
   Instance extends Collection<infer T, infer B, infer S, infer C> ?
-    ObjectDocumentDef<DocDefMatchingKey<Key, T, B, S, C>> :
+    JsonDocumentDef<DocDefMatchingKey<Key, T, B, S, C>> :
   never
 ;
 
 // prettier-ignore
 export type ExtractCollectionJsonDocBody<Instance, Key extends string> =
   Instance extends Collection<infer T, infer B, infer S, infer C> ?
-    ObjectDocumentDef<DocDefMatchingKey<Key, T, B, S, C>>['Body'] :
+    JsonDocumentDef<DocDefMatchingKey<Key, T, B, S, C>>['Body'] :
   never
 ;
 
-export type ExtractCollectionJsonDocKey<Instance> = ObjectDocumentDef<
+export type ExtractCollectionJsonDocKey<Instance> = JsonDocumentDef<
   CollectionDocDef<Instance>
 >['Key'];
 

packages/cbjs/src/clusterTypes/index.ts

@@ -41,7 +41,7 @@ export type {
   MutateInArrayPrependPath,
   MutateInArrayAddUniquePath,
   MutateInArrayInsertPath,
-  MutateInCounterPath,
+  MutateInBinaryPath,
 } from './kv/mutation/mutationOperations.types.js';
 
 export type {
@@ -52,5 +52,4 @@ export type {
   DocDef,
   CollectionName,
   ClusterTypesOptions,
-  DocumentPath,
 } from '@cbjsdev/shared';

packages/cbjs/src/clusterTypes/kv/lookup/lookupIn.types.spec-d.ts

@@ -22,7 +22,6 @@ import { LookupInResult } from '../../../crudoptypes.js';
 import {
   connect,
   DocDef,
-  type LookupInGetPath,
   LookupInMacro,
   LookupInReplicaResult,
   LookupInResultEntry,
@@ -79,9 +78,7 @@ describe('LookupInSpecs', () => {
           LookupInSpec.exists('metadata.tags[0]'),
         ]);
 
-        expectTypeOf(result).toEqualTypeOf<
-          LookupInResult<readonly [any, any, number, boolean]>
-        >();
+        expectTypeOf(result).toEqualTypeOf<LookupInResult<[any, any, number, boolean]>>();
 
         await collection.lookupIn(
           'test__document',
@@ -135,7 +132,7 @@ describe('LookupInSpecs', () => {
         ]);
 
         expectTypeOf(resultInAnyReplica).toEqualTypeOf<
-          LookupInReplicaResult<readonly [any, any, number, boolean]>
+          LookupInReplicaResult<[any, any, number, boolean]>
         >();
 
         const resultInAllReplica = await collection.lookupInAllReplicas(
@@ -149,7 +146,7 @@ describe('LookupInSpecs', () => {
         );
 
         expectTypeOf(resultInAllReplica).toEqualTypeOf<
-          Array<LookupInReplicaResult<readonly [any, any, number, boolean]>>
+          Array<LookupInReplicaResult<[any, any, number, boolean]>>
         >();
       });
 
@@ -165,7 +162,7 @@ describe('LookupInSpecs', () => {
         ]);
 
         expectTypeOf(result).toEqualTypeOf<
-          LookupInResult<readonly [string, any, number, boolean]>
+          LookupInResult<[string, any, number, boolean]>
         >();
 
         const resultInAnyReplica = await collection.lookupInAnyReplica('test__document', [
@@ -176,7 +173,7 @@ describe('LookupInSpecs', () => {
         ]);
 
         expectTypeOf(resultInAnyReplica).toEqualTypeOf<
-          LookupInReplicaResult<readonly [string, any, number, boolean]>
+          LookupInReplicaResult<[string, any, number, boolean]>
         >();
 
         const resultInAllReplica = await collection.lookupInAllReplicas(
@@ -190,7 +187,7 @@ describe('LookupInSpecs', () => {
         );
 
         expectTypeOf(resultInAllReplica).toEqualTypeOf<
-          Array<LookupInReplicaResult<readonly [string, any, number, boolean]>>
+          Array<LookupInReplicaResult<[string, any, number, boolean]>>
         >();
       });
     });
@@ -279,7 +276,7 @@ describe('LookupInSpecs', () => {
         ]);
 
         expectTypeOf(result).toEqualTypeOf<
-          LookupInResult<readonly [string | number, number, boolean]>
+          LookupInResult<[string | number, number, boolean]>
         >();
 
         const resultInAnyReplica = await collection.lookupInAnyReplica('test__document', [
@@ -289,7 +286,7 @@ describe('LookupInSpecs', () => {
         ]);
 
         expectTypeOf(resultInAnyReplica).toEqualTypeOf<
-          LookupInReplicaResult<readonly [string | number, number, boolean]>
+          LookupInReplicaResult<[string | number, number, boolean]>
         >();
 
         const resultInAllReplica = await collection.lookupInAllReplicas(
@@ -302,7 +299,7 @@ describe('LookupInSpecs', () => {
         );
 
         expectTypeOf(resultInAllReplica).toEqualTypeOf<
-          Array<LookupInReplicaResult<readonly [string | number, number, boolean]>>
+          Array<LookupInReplicaResult<[string | number, number, boolean]>>
         >();
       });
     });
@@ -344,17 +341,17 @@ describe('LookupInSpecs', () => {
 
   describe('LookupInSpecResults', () => {
     it('should infer the correct result when using user defined document', () => {
-      expectTypeOf<
-        LookupInSpecResults<
-          [
-            LookupInSpec<TestDocDef, CppProtocolSubdocOpcode.get, 'title'>,
-            LookupInSpec<TestDocDef, CppProtocolSubdocOpcode.exists, 'title'>,
-            LookupInSpec<TestDocDef, CppProtocolSubdocOpcode.get_count, 'metadata'>,
-            LookupInSpec<TestDocDef, CppProtocolSubdocOpcode.get, 'metadata.tags[99]'>,
-          ],
-          TestDocDef
-        >
-      >().toEqualTypeOf<[string, boolean, number, string | undefined]>();
+      type Test = LookupInSpecResults<
+        [
+          LookupInSpec<TestDocDef, CppProtocolSubdocOpcode.get, 'title'>,
+          LookupInSpec<TestDocDef, CppProtocolSubdocOpcode.exists, 'title'>,
+          LookupInSpec<TestDocDef, CppProtocolSubdocOpcode.get_count, 'metadata'>,
+          LookupInSpec<TestDocDef, CppProtocolSubdocOpcode.get, 'metadata.tags[99]'>,
+        ],
+        TestDocDef
+      >;
+
+      expectTypeOf<Test>().toEqualTypeOf<[string, boolean, number, string]>();
     });
 
     it('should provide best-effort when using collection documents', () => {

packages/cbjs/src/clusterTypes/kv/lookup/lookupIn.types.ts

@@ -13,16 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {
+import type {
   AnyDocDef,
   ArrayElement,
-  DocDefBodyPathShape,
   DocDefBodyShape,
+  DocumentCodeCompletion,
   If,
   IsArrayLengthFixed,
   IsFuzzyDocument,
-  LookupInMacroReturnType,
-  SubDocument,
+  LookupInMacroReturnType, OpCodeCompletionValue,
   Try,
 } from '@cbjsdev/shared';
 
@@ -36,10 +35,8 @@ import type { LookupInCountPath, LookupInExistsPath, LookupInGetPath } from './l
 /**
  * Return a {@link LookupInSpec} type with `Path` converted to an internal path.
  */
-export type MakeLookupInSpec<Def, Opcode extends LookupInSpecOpCode, Path> =
-  Def extends AnyDocDef ?
-    LookupInSpec<Def, Opcode, ToLookupInternalPath<Path>> :
-  never
+export type MakeLookupInSpec<Def extends AnyDocDef, Opcode extends LookupInSpecOpCode, Path> =
+  LookupInSpec<Def, Opcode, ToLookupInternalPath<Path>>
 ;
 
 /**
@@ -63,17 +60,17 @@ export type LookupInSpecResults<Specs, Defs> =
  * Spec operation result type for a single {@link LookupInSpec}.
  */
 export type LookupInSpecResult<Spec, Def> =
-  Def extends DocDefBodyPathShape ?
-    Spec extends LookupInSpec<infer LookupDef> ?
-      Spec['_op'] extends CppProtocolSubdocOpcode.get | CppProtocolSubdocOpcode.get_doc ?
-        Spec['_path'] extends keyof LookupInMacroReturnType ?
-          LookupInMacroReturnType[Spec['_path']] :
+  Def extends DocDefBodyShape ?
+    Spec extends LookupInSpec<infer LookupDef, infer Op, infer Path> ?
+      Op extends CppProtocolSubdocOpcode.get | CppProtocolSubdocOpcode.get_doc ?
+        Path extends keyof LookupInMacroReturnType ?
+          LookupInMacroReturnType[Path] :
         IsFuzzyDocument<LookupDef['Body']> extends true ?
-          SubDocument<Def['Body'], Spec['_path']> :
-        SubDocument<LookupDef['Body'], Spec['_path']> :
-      Spec['_op'] extends CppProtocolSubdocOpcode.get_count ?
+          OpCodeCompletionValue<'get', Def['Body'], Path> :
+        OpCodeCompletionValue<'get', LookupDef['Body'], Path> :
+      Op extends CppProtocolSubdocOpcode.get_count ?
         number :
-      Spec['_op'] extends CppProtocolSubdocOpcode.exists ?
+      Op extends CppProtocolSubdocOpcode.exists ?
         boolean :
       never :
     never :
@@ -137,11 +134,11 @@ export type LookupInInternalPath<Def, Opcode extends LookupInSpecOpCode> =
 /**
  * Transform the spec path into the spec internal path.
  */
-export type ToLookupInternalPath<PublicPath> =
-  PublicPath extends LookupInMacro<infer LookupInMacroPath> ?
+export type ToLookupInternalPath<UserPath> =
+  UserPath extends LookupInMacro<infer LookupInMacroPath> ?
       LookupInMacroPath :
-  PublicPath extends string ?
-    PublicPath :
+  UserPath extends string ?
+    UserPath :
   never
 ;
 
@@ -153,9 +150,9 @@ export type ValidateLookupInSpec<ExpectedDefs, Spec> =
   ExpectedDefs extends AnyDocDef ?
     Spec extends LookupInSpec<infer Def, infer Opcode, infer InternalPath> ?
       IsFuzzyDocument<ExpectedDefs['Body']> extends true ?
-        LookupInSpec<Def, Opcode, InternalPath> :
+        Spec :
       InternalPath extends AnyLookupInInternalPath<ExpectedDefs, Opcode> ?
-        LookupInSpec<ExpectedDefs, Opcode> :
+        Spec :
       `Invalid path: Cannot perform '${LookupInSpecOperationFriendlyName[Opcode]}' at '${InternalPath}' on any declared document.` :
     never :
   never
@@ -166,8 +163,8 @@ export type ValidateLookupInSpec<ExpectedDefs, Spec> =
  * Validate an array of `MutateInSpec`.
  */
 export type ValidateLookupInSpecs<ExpectedDefs, Specs> =
-  Specs extends readonly [LookupInSpec<infer Def, infer Opcode, infer InternalPath>, ...infer Rest] ?
-    [ValidateLookupInSpec<ExpectedDefs, LookupInSpec<Def, Opcode, InternalPath>>, ...ValidateLookupInSpecs<ExpectedDefs, Rest>] :
+  Specs extends readonly [infer Head, ...infer Rest] ?
+    [ValidateLookupInSpec<ExpectedDefs, Head>, ...ValidateLookupInSpecs<ExpectedDefs, Rest>] :
   // Specs extends ReadonlyArray<LookupInSpec<Defs>> ?
   //   Specs :
   []