Merge pull request #34 from glideapps/arrays

Arrays and released flag

Author: schani

src/columns/app-icon.ts

@@ -32,7 +32,7 @@ export async function fetchAppIcon(
 
 const run: glide.Column = async url => {
   if (url.value === undefined) return undefined;
-  return await cache.getWith(url.value, fetchAppIcon);
+  return await cache.getWith(url.value.toString(), fetchAppIcon);
 };
 
 export default glide.column({

src/columns/capitalize.ts

@@ -5,6 +5,7 @@ import capitalize from "lodash/capitalize";
 export default glide
   .columnNamed("Capitalize Text")
   .withCategory("Text")
+  .withReleased("direct")
   .withDescription(
     `Converts the first character of string to upper case and the remaining to lower case.`
   )

src/columns/clamp.ts

@@ -3,6 +3,7 @@ import * as glide from "../glide";
 export default glide
   .columnNamed("Clamp")
   .withCategory("Number")
+  .withReleased("direct")
   .withDescription(`Clamps a number within inclusive lower and upper bounds.`)
   .withNumberResult()
   .withRequiredNumberParam("number")

src/columns/fetch.ts

@@ -11,7 +11,7 @@ const run: glide.Column = async (url, query) => {
   if (url.value === undefined) {
     return undefined;
   }
-  let data = await cache.fetch(url.value);
+  let data = await cache.fetch(url.value.toString());
   if (query.value !== undefined) {
     data = jq.json(data, query.value);
   }

src/columns/glide-brand-image.ts

@@ -18,8 +18,8 @@ const run: glide.Column = async (categoryValue, randomSeed) => {
   const images = await cache.fetch(
     `https://column.sh/glide-brand-image/images.json`
   );
-  const is = images[category] ?? images[defaultCategory];
-  const random = seedrandom(seed)();
+  const is = images[category.toString()] ?? images[defaultCategory];
+  const random = seedrandom(seed.toString())();
   const image = is[Math.floor(random * is.length)];
 
   // TODO move these images to CDN, not Vercel

src/columns/hell-yes-code.ts

@@ -12,14 +12,15 @@ const run: glide.Column = async (code, ...params) => {
   // TODO https://esbuild.github.io/content-types/#direct-eval
   const fn = (0, eval)(functionCode);
 
-  functions.set(code.value, fn);
+  functions.set(code.value.toString(), fn);
 
   return fn(...params.map(p => p.value));
 };
 
 export default glide.column({
   name: "Hell Yes-Code",
   category: "Code",
+  released: "sandboxed",
   description: "Runs JavaScript",
   about: `Inludes [lodash](https://lodash.com/docs).`,
   author: "Mark Probst <[email protected]>",

src/columns/hyperformula.ts

@@ -19,6 +19,7 @@ const run: glide.Column = async (formula, ...params) => {
 export default glide.column({
   name: "Hyperformula",
   category: "Code",
+  released: "sandboxed",
   description: "Run Excel formulas",
   about: `
       Uses [handsontable.github.io/hyperformula](https://handsontable.github.io/hyperformula) to evaluate

src/columns/jq.ts

@@ -10,7 +10,7 @@ const run: glide.Column = async (json, query) => {
     return json.value;
   }
 
-  const val = jq.json(JSON.parse(json.value), query.value);
+  const val = jq.json(JSON.parse(json.value.toString()), query.value);
 
   if (val === null) {
     return undefined;

src/columns/reverse-array.ts

@@ -0,0 +1,14 @@
+import * as glide from "../glide";
+
+export default glide
+  .columnNamed("Reverse Array")
+  .withDescription(
+      "Reverses the order of items in an array"
+  )
+  .withReleased("direct")
+  .withPrimitiveArrayResult()
+  .withPrimitiveArrayParam("array")
+  .run(({ array }) => {
+      if (array === undefined) return undefined;
+      return [...array].reverse();
+  });

src/columns/youtube-thumbnail.ts

@@ -18,7 +18,7 @@ const run: glide.Column = async link => {
   if (link.value === undefined) {
     return undefined;
   }
-  return thumbnailFromLink(link.value);
+  return thumbnailFromLink(link.value.toString());
 };
 
 export default glide.column({

src/glide.ts

@@ -1,6 +1,6 @@
 import startCase from "lodash/startCase";
 
-export type ColumnType =
+export type PrimitiveColumnType =
   | "string"
   | "primitive"
   | "number"
@@ -9,6 +9,8 @@ export type ColumnType =
   | "date-time"
   | "uri";
 
+export type ColumnType = PrimitiveColumnType | { kind: "array", items: PrimitiveColumnType };
+
 export type StringColumnValue = { type: "string"; value?: string };
 
 export type ColumnParam = {
@@ -17,9 +19,12 @@ export type ColumnParam = {
   type: ColumnType;
 };
 
+export type PrimitiveValue = string | number | boolean;
+
 export type ColumnValue =
-  | { type: "primitive"; value?: any }
+  | { type: "primitive"; value?: PrimitiveValue }
   | { type: "number"; value?: number }
+  | { type: "boolean"; value?: boolean }
   | StringColumnValue;
 
 export type Column = (...values: ColumnValue[]) => any | Promise<any>;
@@ -79,9 +84,12 @@ export type Category =
   | "Date & Time"
   | "Code";
 
+type Released = "direct" | "sandboxed";
+
 export type Manifest = {
   name: string;
   category: Category;
+  released?: Released;
   description: string;
   author: string;
   params: ColumnParam[];
@@ -149,7 +157,7 @@ export function toStrictManifest(
 ): Manifest {
   // We carefully pick out just the props in manifest, because more
   // could come in from the component.
-  const { name, category, description, author, result, params, about, video } =
+  const { name, category, released, description, author, result, params, about, video } =
     convenient;
 
   let { icon = defaultIcon } = convenient;
@@ -160,6 +168,7 @@ export function toStrictManifest(
   return {
     name,
     category,
+    released,
     description,
     author,
     result,
@@ -176,6 +185,7 @@ export function toStrictManifest(
 const defaultDefinition: ColumnDefinition = {
   name: "Glide Column",
   category: "General",
+  released: undefined,
   description: "No description",
   author: "Glide <[email protected]>",
   params: {},
@@ -222,6 +232,10 @@ export class Col<TParams = {}, TResult = string> {
     return this.with({ category });
   }
 
+  public withReleased(released: "direct" | "sandboxed") {
+    return this.with({ released })
+  }
+
   public withDescription(description: string) {
     return this.with({ description });
   }
@@ -273,6 +287,18 @@ export class Col<TParams = {}, TResult = string> {
     return this.withResult<boolean>("boolean");
   }
 
+  public withStringArrayResult() {
+    return this.withResult<string[]>({ kind: "array", items: "string"});
+  }
+
+  public withNumberArrayResult() {
+    return this.withResult<number[]>({ kind: "array", items: "number"});
+  }
+
+  public withPrimitiveArrayResult() {
+    return this.withResult<PrimitiveValue[]>({ kind: "array", items: "primitive"});
+  }
+
   public withParam<TParam, TName extends string>(
     type: ColumnType,
     name: TName,
@@ -341,6 +367,22 @@ export class Col<TParams = {}, TResult = string> {
     return this.withRequiredParam<number, T>("number", name, displayName);
   }
 
+  public withStringArrayParam<T extends string>(name: T, displayName?: string) {
+    return this.withParam<string[], T>({ kind: "array", items: "string"}, name, displayName);
+  }
+
+  public withNumberArrayParam<T extends string>(name: T, displayName?: string) {
+    return this.withParam<number[], T>({ kind: "array", items: "number"}, name, displayName);
+  }
+
+  public withPrimitiveArrayParam<T extends string>(name: T, displayName?: string) {
+    return this.withParam<PrimitiveValue[], T>({ kind: "array", items: "primitive"}, name, displayName);
+  }
+
+  public withExample(example: TParams) {
+    return this.with({ example });
+  }
+
   public run(
     columnFunction: (
       params: TParams