fix typing issue

packages/cli/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @indirectus/cli
 
+## 0.2.1
+
+### Patch Changes
+
+- fix type issue with empty types
+
 ## 0.1.0
 
 ### Minor Changes

packages/cli/default/extensions/filters/directus.ts

@@ -1,6 +1,5 @@
-import { Field } from "../../../types/registry";
+import { Collection, Field } from "../../../types/registry";
 
-import { contains } from "./contains";
 import { json } from "./json";
 import { quote, quoted } from "./quote";
 
@@ -168,3 +167,20 @@ export function to_ts_type(context: TemplateContext, field: Field) {
 
   return output;
 }
+
+export function only_system_fields(context: TemplateContext, fields: Field[]) {
+  return fields.filter((field) => field.is_system);
+}
+
+export function only_custom_fields(context: TemplateContext, fields: Field[]) {
+  return fields.filter((field) => !field.is_system);
+}
+
+export function only_with_custom_fields(
+  context: TemplateContext,
+  collections: Collection[],
+) {
+  return collections.filter(
+    (field) => field.fields.filter((field) => !field.is_system).length > 0,
+  );
+}

packages/cli/default/templates/default/client.ts.njk

@@ -1,7 +1,6 @@
-{%- import "macro:typescript/types" as ts -%}
 {% block header %}
 /**
- * This file is automatically generated by the `@indirectus/sdk` package.
+ * This file is automatically generated by the `@indirectus/cli` package.
  * Follow the package's instruction to update this file with the latest schema.
  */
 {% endblock %}
@@ -32,20 +31,27 @@ export type BigInt = number;
 export namespace Collections {
   {% for collection in registry.collections -%}
   {% if collection.is_system %}
+
+  {%- set field_count = collection.fields | only_custom_fields | length -%}
+  {%- if field_count > 0 -%}
     {% filter comment -%}
-    The {{ collection.name | to_collection_text }} custom fields.
+    The extra fields added to the {{ collection.name | to_collection_text }} collection.
     {% endfilter %}
-    export interface {{ collection.name | to_collection_name }} extends Directus.{{ collection.name | to_collection_name }}<Schema> {
-  {%- for field in collection.fields %}
-  {% if not collection.is_system %}
-    {%- set type = field | to_ts_type -%}
-    {%- if type != 'never' %}
-    {{ field.name | to_ts_identifier }}: {{ type }};
-    {%- endif -%}
-  {% endif %}
-  {%- endfor %}
+    export interface Extra{{ collection.name | to_collection_name }} {
+      {%- for field in collection.fields | only_custom_fields %}
+        {%- set type = field | to_ts_type -%}
+        {%- if type != 'never' %}
+          {{ field.name | to_ts_identifier }}: {{ type }};
+        {%- endif -%}
+      {%- endfor %}
     };
   {% endif %}
+
+    {% filter comment -%}
+    The resolved {{ collection.name | to_collection_text }} collection type.
+    {% endfilter %}
+    export type {{ collection.name | to_collection_name }} = Directus.{{ collection.name | to_collection_name }}<Schema>;
+  {% endif %}
   {% endfor %}
   }
 
@@ -78,13 +84,15 @@ export namespace Collections {
  */
 export interface Schema {
 
-{% for collection in registry.collections -%}
+{% for collection in registry.collections | only_with_custom_fields -%}
   {% if collection.is_system %}
   {% set suffix = "" if collection.is_singleton else "[]" %}
+
+  {%- set field_count = collection.fields | only_custom_fields | length -%}
   /**
    * The extended {{ collection.name | to_collection_text }} collection.
    */
-  {{ collection.name | to_ts_identifier }}: Collections.{{ collection.name | to_collection_name }}{{ suffix }};
+  {{ collection.name | to_ts_identifier }}: Collections.Extra{{ collection.name | to_collection_name }}{{ suffix }};
   {% endif %}
 {% endfor %}
 
@@ -150,3 +158,4 @@ export function read{{ collection.name | to_collection_name }}<
 
 {% endif %}
 {% endfor %}
+

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indirectus/cli",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "license": "MIT",
   "description": "Directus Tools CLI.",
   "keywords": [

packages/cli/types/generator.ts

@@ -281,7 +281,7 @@ export class Generator extends TypedEventEmitter<GeneratorEvents> {
     let context: string[] = [];
 
     if (typeof err != "string" && err != null) {
-      message = err?.message
+      message = (err?.message || "")
         .replace(/, file:/g, "\n")
         .replace(/, line:/g, ":")
         .replace(/, col:/g, ":");

packages/cli/types/registry.ts

@@ -49,7 +49,7 @@ export class Type {
   }
 
   public get is_system() {
-    return "system" in this.raw.meta && this.raw.meta.system;
+    return "system" in this.raw.meta && !!this.raw.meta.system;
   }
 }
 

packages/indirectus/CHANGELOG.md

@@ -1,5 +1,12 @@
 # indirectus
 
+## 0.2.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @indirectus/cli@0.2.1
+
 ## 0.1.0
 
 ### Minor Changes

packages/indirectus/package.json

@@ -1,6 +1,6 @@
 {
   "name": "indirectus",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "license": "MIT",
   "description": "Directus Tools CLI.",
   "keywords": [