Rename Data to FileAttachment

observablehq · Sep 23, 2019 · 70e6f03 · 70e6f03
1 parent 07c42e4
commit 70e6f03
Show file tree

Hide file tree

Showing 9 changed files with 263 additions and 263 deletions.
diff --git a/src/data.js → src/file-attachments.js b/src/data.js → src/file-attachments.js
@@ -1,20 +1,20 @@
 import {simple} from "acorn-walk";
 import walk from "./walk.js";
 
-export default function findData(cell) {
+export default function findFileAttachments(cell) {
   const ast = {type: "Program", body: [cell.body]};
-  const dataReferences = new Set();
+  const references = new Set();
 
   simple(
     ast,
     {
       CallExpression: node => {
         const {callee, arguments: args} = node;
 
-        // Ignore function calls that are not references to Data
-        if (!(callee.type === "Identifier" && callee.name === "Data")) return;
+        // Ignore function calls that are not references to FileAttachment
+        if (!(callee.type === "Identifier" && callee.name === "FileAttachment")) return;
 
-        // Forbid all sorts of dynamic uses of Data
+        // Forbid all sorts of dynamic uses of FileAttachment
         if (
           !(
             args.length === 1 &&
@@ -25,13 +25,13 @@ export default function findData(cell) {
         ) {
           throw Object.assign(
             new SyntaxError(
-              `Data() requires a single literal string as its argument.`
+              `FileAttachment() requires a single literal string as its argument.`
             ),
             {node}
           );
         }
 
-        dataReferences.add(
+        references.add(
           args[0].type === "Literal"
             ? args[0].value
             : args[0].quasis[0].value.cooked
@@ -41,5 +41,5 @@ export default function findData(cell) {
     walk
   );
 
-  return dataReferences;
+  return references;
 }
diff --git a/src/parse.js b/src/parse.js
@@ -3,7 +3,7 @@ import bigInt from "acorn-bigint";
 import dynamicImport from "./dynamic-import.js";
 import defaultGlobals from "./globals.js";
 import findReferences from "./references.js";
-import findData from "./data.js";
+import findFileAttachments from "./file-attachments.js";
 
 const SCOPE_FUNCTION = 2;
 const SCOPE_ASYNC = 4;
@@ -306,7 +306,7 @@ function parseReferences(cell, input, globals = defaultGlobals) {
 function parseData(cell, input) {
   if (cell.body && cell.body.type !== "ImportDeclaration") {
     try {
-      cell.data = findData(cell);
+      cell.fileAttachments = findFileAttachments(cell);
     } catch (error) {
       if (error.node) {
         const loc = getLineInfo(input, error.node.start);